drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,889 Commits 1 Branch 0 Tags
Commit Graph

92889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sascha Prueter
eb3aa44c10 am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit '972dd431f81432f1bbb33d2e7f34fcd5f4764870':
  Final icon for notifications panel
 2012-11-07 14:12:33 -08:00
Sascha Prueter
972dd431f8 Merge "Final icon for notifications panel" into jb-mr1-dev 2012-11-07 14:08:22 -08:00
Adam Powell
eeb6255056 Fix keyguard measurement bugs 
Bug 7493748
Bug 7493764

Change-Id: I2182ec4347eefc80198e675684bc5d195f947763
 2012-11-07 14:07:46 -08:00
Victoria Lease
bf328b4043 am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit '4abe2d3d367029080653818f538222603f13bed2':
  disable geofences for secondary users
 2012-11-07 14:03:55 -08:00
Victoria Lease
eb6cbc22b2 am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
  disable geofences for secondary users
 2012-11-07 14:01:41 -08:00
Victoria Lease
4abe2d3d36 am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit 'ad84f7f46b0207a7ad316b4df37c1f02c889cca9':
  disable geofences for secondary users
 2012-11-07 14:01:31 -08:00
Victoria Lease
ad84f7f46b Merge "disable geofences for secondary users" into jb-mr1-dev 2012-11-07 13:56:46 -08:00
Chris Wren
8e3bf41d8b Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 2012-11-07 13:49:03 -08:00
Chris Wren
d2dec00a0a add logging to enableUserSelectorIfNecessary. 
Bug: 7437751
Change-Id: I4a223ac68f780dac212ee5ed0729d59278fd1e4b
 2012-11-07 16:38:33 -05:00
Daniel Sandler
1ce804397f Make dismissKeyguardLw use KeyguardViewMediator.dismiss(). 
It previously did some of the logic of dismiss() itself:
checking to see if the KG is secure, and if not, proceeding
to call keyguardDone() to actually hide everything. But now
that we have the "bouncer" authentication UI, the WM should
let the keyguard challenge the user to see if even a secure
keyguard should be dismissed. (Insecure keyguards should
behave exactly has they did before.)

Unless, of course, the KVM is in a "dismissable" state, in
which case it's safe to call keyguardDone() directly. (This
can happen if the user has *already* authenticated and we're
ending up in this codepath in response.)

Bug: 7458531
Change-Id: I9571acf19f9bcc16bba7a826f916da7be8ca9c33
 2012-11-07 16:38:21 -05:00
The Android Automerger
02253f4893 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-07 13:05:55 -08:00
Irfan Sheriff
cd3d75f35d Re-use existing thread 
Bug: 7377541
Change-Id: I097f2288ebfc2b4a9782cbced19d9c36d0703acb
 2012-11-07 13:02:08 -08:00
Daniel Sandler
ccbfd617e7 am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit '7b5a92766a0b04af7cb6a9e9905ec37e7885ea64':
  Fix docs to refer to the correct class.
 2012-11-07 12:40:30 -08:00
Chris Wren
b524f4b928 Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 2012-11-07 12:39:54 -08:00
Joe Malin
8d40d04afa Notification.java javadoc: addAction 
Change-Id: I86fe116f50d8462494cfc9f138e1c885ae5a41ea
 2012-11-07 12:39:22 -08:00
Daniel Sandler
2d09880d03 am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit 'afc5210a811da3824d75e32d998370203aba1968':
  Fix docs to refer to the correct class.
 2012-11-07 12:37:28 -08:00
Daniel Sandler
7b5a92766a am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit 'afc5210a811da3824d75e32d998370203aba1968':
  Fix docs to refer to the correct class.
 2012-11-07 12:37:28 -08:00
Daniel Sandler
afc5210a81 Merge "Fix docs to refer to the correct class." into jb-mr1-dev 2012-11-07 12:35:01 -08:00
Chris Wren
91f080c777 add some defensive code to enableUserSelectorIfNecessary. 
Bug: 7437751
Change-Id: I3f8e317624f158fce0d58be69b733699a208d802
 2012-11-07 15:21:37 -05:00
Baligh Uddin
6ee0c2b868 am 0d29833f: am 32226b73: Import translations. DO NOT MERGE 
* commit '0d29833f96cb6135e7e4a3507f3019d1ea637126':
  Import translations. DO NOT MERGE
 2012-11-07 12:00:11 -08:00
Baligh Uddin
62e2374baa am 32226b73: (-s ours) Import translations. DO NOT MERGE 
* commit '32226b73ca908b2ee45c6ee651437aec2ab93489':
  Import translations. DO NOT MERGE
 2012-11-07 11:58:11 -08:00
Baligh Uddin
0d29833f96 am 32226b73: Import translations. DO NOT MERGE 
* commit '32226b73ca908b2ee45c6ee651437aec2ab93489':
  Import translations. DO NOT MERGE
 2012-11-07 11:57:36 -08:00
Baligh Uddin
32226b73ca Import translations. DO NOT MERGE 
Change-Id: I82793ad9ed66b4e2924b3c32a2292bad69b56579
Auto-generated-cl: translation import
 2012-11-07 11:54:30 -08:00
Baligh Uddin
d44c4344aa Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-07 11:52:29 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Adam Cohen
8f837a690b Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev 2012-11-07 11:51:06 -08:00
Baligh Uddin
eaa70d7218 am b97aadec: am fc958f12: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'b97aadec0f2ae34bf537d93cd07438421c370bf2':
  Import translations. DO NOT MERGE
 2012-11-07 11:45:45 -08:00
Adam Cohen
4eb36cfdca Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235) 
Change-Id: I736816dac8cea47632fbdbc75b367f2c6216dff7
 2012-11-07 11:45:30 -08:00
Kenny Root
768d9e1a72 Merge "Correct executable bit for source files" 2012-11-07 11:45:14 -08:00
Baligh Uddin
db60b67533 am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'fc958f12f639a6a9cb676b0d1e30ed67b4f5a455':
  Import translations. DO NOT MERGE
 2012-11-07 11:42:46 -08:00
Baligh Uddin
b97aadec0f am fc958f12: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'fc958f12f639a6a9cb676b0d1e30ed67b4f5a455':
  Import translations. DO NOT MERGE
 2012-11-07 11:42:04 -08:00
Baligh Uddin
fc958f12f6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-07 11:39:41 -08:00
The Android Open Source Project
bc287eb8fe am 63985103: Reconcile with jb-mr1-release - do not merge 
* commit '63985103f3bcdc64cc030524a2915a93cc03bc5f':
 2012-11-07 11:39:29 -08:00
John Spurlock
5d5613651e am 66453ff5: am 506fd3b0: Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev 
* commit '66453ff5348cc169591805c29cda3d046c19f842':
  Low battery dialog should use UserHandle.CURRENT.
 2012-11-07 11:37:25 -08:00
The Android Open Source Project
63985103f3 Reconcile with jb-mr1-release - do not merge 
Change-Id: I290ad0de0601dc3c49366d7b9d44d9d30021559d
 2012-11-07 11:36:42 -08:00
Baligh Uddin
2d6a1b778d Import translations. DO NOT MERGE 
Change-Id: Ia0befbcb0a476a7afffa3cd748625fa9f32e826f
Auto-generated-cl: translation import
 2012-11-07 11:34:53 -08:00
John Spurlock
66453ff534 am 506fd3b0: Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev 
* commit '506fd3b02ef4b036aceb66db76ca93c55254bfcf':
  Low battery dialog should use UserHandle.CURRENT.
 2012-11-07 11:34:47 -08:00
Baligh Uddin
658e350daf Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-07 11:33:07 -08:00
John Spurlock
506fd3b02e Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev 2012-11-07 11:31:30 -08:00
Baligh Uddin
d5ef55df10 Import translations. DO NOT MERGE 
Change-Id: Ia17c77e31bea23907d9d28a0d12acf4ed9040eb6
Auto-generated-cl: translation import
 2012-11-07 11:31:14 -08:00
Romain Guy
de60dd2d13 am fcd7ad4e: am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev 
* commit 'fcd7ad4e28df6a408e84c6d2b2f425b029efbfbe':
  Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
 2012-11-07 11:22:43 -08:00
Roman Nurik
a62316b393 am 081e6b7d: am 0fc1b5ec: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 
* commit '081e6b7daf8cbdaec7ae0ad626880a4576031e38':
 2012-11-07 11:20:26 -08:00
Baligh Uddin
19068c088b am dac8d6d9: am a40ec75e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'dac8d6d999617936c1c0c59926351a538c70931c':
  Import translations. DO NOT MERGE
 2012-11-07 11:20:22 -08:00
Daniel Sandler
334d66ed41 am 6f562e9f: am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev 
* commit '6f562e9fabb2dd35997708963a0e7935c19aea7b':
  Show the assist ring on center-button longpress on lockscreen.
 2012-11-07 11:20:19 -08:00
Baligh Uddin
9310aa1886 am b38b3ed1: (-s ours) am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'b38b3ed1235eab98942a79ad8037dbdc8e42f409':
  Import translations. DO NOT MERGE
 2012-11-07 11:20:15 -08:00
Romain Guy
fcd7ad4e28 am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev 
* commit '59d73ab6fcc80b9e08ff06cfc13617a2f65af60e':
  Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
 2012-11-07 11:18:55 -08:00
Chris Wren
193cd46c47 am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev 
* commit '53d819687e29ea8b400f4852295fbec3fabb9f7b':
  Don't pop the IME for passwors at ScreenOn on tablets.
 2012-11-07 11:18:21 -08:00
Brian Colonna
1e85c8edfb am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev 
* commit '9885568eb7b85f743ff7c8a1503251a54ed9ea73':
  Centering FUL fixes b/7480608
 2012-11-07 11:18:17 -08:00
John Spurlock
1ef6398e93 am 3dcb3628: am 34c4fe52: Fix remaining jank in secure add-widget transition. 
* commit '3dcb3628c74d430631eb57bf0829f560a9c50499':
  Fix remaining jank in secure add-widget transition.
 2012-11-07 11:18:09 -08:00
The Android Automerger
5246b8a8e2 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-07 11:18:07 -08:00