summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix bug where newly added widget wasn't always shown" into ↵Michael Jurka2012-11-072-1/+18
|\ | | | | | | jb-mr1-lockscreen-dev
| * Fix bug where newly added widget wasn't always shownMichael Jurka2012-11-072-1/+18
| | | | | | | | | | Bug: 7491900 Change-Id: I878eea745ee6127b757aa945631c1a4eb08d9936
* | Merge "Fixing up glowpad scaling issues (issue 7494378)" into ↵Adam Cohen2012-11-073-4/+20
|\ \ | | | | | | | | | jb-mr1-lockscreen-dev
| * | Fixing up glowpad scaling issues (issue 7494378)Adam Cohen2012-11-073-4/+20
| | | | | | | | | | | | Change-Id: I55c0f7a3774d42d4f5893b12bc0c08690268e351
* | | Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-devAdam Powell2012-11-072-4/+4
|\ \ \
| * | | Fix keyguard measurement bugsAdam Powell2012-11-072-4/+4
| | |/ | |/| | | | | | | | | | | | | | | | Bug 7493748 Bug 7493764 Change-Id: I2182ec4347eefc80198e675684bc5d195f947763
* | | am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-devSascha Prueter2012-11-077-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * commit '972dd431f81432f1bbb33d2e7f34fcd5f4764870': Final icon for notifications panel
| * \ \ Merge "Final icon for notifications panel" into jb-mr1-devSascha Prueter2012-11-077-2/+2
| |\ \ \
| | * | | Final icon for notifications panelDaniel Sandler2012-11-067-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7474127 Change-Id: I391ef8d607142ab9007439479aebb39e1bfb55f2
* | | | | am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-devVictoria Lease2012-11-071-0/+5
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9': disable geofences for secondary users
| * | | | Merge "disable geofences for secondary users" into jb-mr1-devVictoria Lease2012-11-071-0/+5
| |\ \ \ \
| | * | | | disable geofences for secondary usersVictoria Lease2012-11-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geofences are broken in multiuser, and need to be fixed before reenabling the feature for secondary users. Change-Id: Ief3008a294deed47760ee25efcf1cdef5371b038
* | | | | | Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-devChris Wren2012-11-071-4/+24
|\ \ \ \ \ \
| * | | | | | add logging to enableUserSelectorIfNecessary.Chris Wren2012-11-071-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7437751 Change-Id: I4a223ac68f780dac212ee5ed0729d59278fd1e4b
* | | | | | | Merge "add some defensive code to enableUserSelectorIfNecessary." into ↵Chris Wren2012-11-071-26/+29
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | jb-mr1-lockscreen-dev
| * | | | | | add some defensive code to enableUserSelectorIfNecessary.Chris Wren2012-11-071-26/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7437751 Change-Id: I3f8e317624f158fce0d58be69b733699a208d802
* | | | | | | am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-devDaniel Sandler2012-11-071-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'afc5210a811da3824d75e32d998370203aba1968': Fix docs to refer to the correct class.
| * | | | | | Merge "Fix docs to refer to the correct class." into jb-mr1-devDaniel Sandler2012-11-071-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix docs to refer to the correct class.Daniel Sandler2012-11-071-1/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6676920 Change-Id: Ib79635cb3ff464b4686268fcf64b99cacaa9e627
* | | | | | | am 32226b73: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2012-11-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '32226b73ca908b2ee45c6ee651437aec2ab93489': Import translations. DO NOT MERGE
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-0739-78/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82793ad9ed66b4e2924b3c32a2292bad69b56579 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-devBaligh Uddin2012-11-0739-78/+40
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-0739-78/+40
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia0befbcb0a476a7afffa3cd748625fa9f32e826f Auto-generated-cl: translation import
* | | | | | | Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent ↵Adam Cohen2012-11-072-3/+11
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | (issue 7492235)" into jb-mr1-lockscreen-dev
| * | | | | | Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue ↵Adam Cohen2012-11-072-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7492235) Change-Id: I736816dac8cea47632fbdbc75b367f2c6216dff7
* | | | | | | am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-11-070-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'fc958f12f639a6a9cb676b0d1e30ed67b4f5a455': Import translations. DO NOT MERGE
| * | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-11-070-0/+0
| |\ \ \ \ \ \ |/ / / / / / /
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-064-4/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ecdfe214d3fa7552f2ec51205da62c8b7df8d9b Auto-generated-cl: translation import
* | | | | | Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-devJohn Spurlock2012-11-071-1/+2
|\ \ \ \ \ \
| * | | | | | Low battery dialog should use UserHandle.CURRENT.John Spurlock2012-11-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:7493313 Change-Id: Ie753633c550e4ce679fbb6f9e0c6adf56392ec87
* | | | | | | Merge "Respond to ticks when a timezone is set and it doesn't display ↵Romain Guy2012-11-071-11/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | seconds Bug #7489774" into jb-mr1-dev
| * | | | | | Respond to ticks when a timezone is set and it doesn't display secondsRomain Guy2012-11-061-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7489774 This change also fixes a crash if you programmatically set the time formats from code before the widget is attached to the window. Change-Id: I73ead93f5866d9059a4b3823c4304aeca8e419b6
* | | | | | | am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into ↵Roman Nurik2012-11-071-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '512950a9713f79f2900c73201906436d12da8639': docs: Minor Nexus 10 fix in Device Art Generator
| * \ \ \ \ \ \ Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-devRoman Nurik2012-11-071-0/+0
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | docs: Minor Nexus 10 fix in Device Art GeneratorRoman Nurik2012-11-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0fb08d484de812f064d141551963bc37c91267b
* | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-devBaligh Uddin2012-11-074-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-064-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic647d879dc7392501863f4531f048b17faa1fd07 Auto-generated-cl: translation import
* | | | | | | | | Merge "Show the assist ring on center-button longpress on lockscreen." into ↵Daniel Sandler2012-11-071-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-lockscreen-dev
| * | | | | | | | | Show the assist ring on center-button longpress on lockscreen.Daniel Sandler2012-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7480028 Change-Id: I4c8013e984c2591faf3bc8fe2048abf69d545b6c
* | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-devBaligh Uddin2012-11-0749-247/+257
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-11-0649-247/+257
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I76ae2d0dfa8538ffd649c69ed2aaa7128a29e2ea Auto-generated-cl: translation import
* | | | | | | | | | Merge "Don't pop the IME for passwors at ScreenOn on tablets." into ↵Chris Wren2012-11-0714-17/+29
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-lockscreen-dev
| * | | | | | | | | | Don't pop the IME for passwors at ScreenOn on tablets.Chris Wren2012-11-0714-17/+29
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c157559b2a70021d55211607c1d62ba73adc590
* | | | | | | | | | Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-devBrian Colonna2012-11-071-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Centering FUL fixes b/7480608Brian Colonna2012-11-071-0/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A simple one-line change to center FUL horizontally. This looked really bad on tablets when the charging text was showing as FUL was obviously off-center compared to the text. It was also off-center on phones, which looked particularly bad when going to the backup. Change-Id: Id0e3039a67c9bb746a8c9948e82ff87b6c815e1b
* | | | | | | | | | Fix remaining jank in secure add-widget transition.John Spurlock2012-11-076-41/+69
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait for activity to launch before dismissing the keyguard. Otherwise we see launcher/last activity waiting for the picker to start up. Also remove camera transition workaround obviated by: Iefee62061962625b622ff2cf9a307d9429c2ad54 Bug:7482560 Change-Id: I554ddffb7981488fa8a81933842b0c7730e775f3
* | | | | | | | | Merge "Allowing rotation while adding lockscreen widgets" into ↵Michael Jurka2012-11-072-20/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-lockscreen-dev
| * | | | | | | | | Allowing rotation while adding lockscreen widgetsMichael Jurka2012-11-072-20/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleaning up some unused code Bug: 7468012
* | | | | | | | | | Merge "Giving glow pad the brains to scale itself dynamically (issue ↵Adam Cohen2012-11-061-17/+99
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | 7449554)" into jb-mr1-lockscreen-dev
| * | | | | | | | | Giving glow pad the brains to scale itself dynamically (issue 7449554)Adam Cohen2012-11-061-17/+99
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I44f31d354171c01b607871d6a9e1e9d06a49ffc8