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

11095 Commits

Author SHA1 Message Date
Geoff Mendal
b501dd1fad Import translations. DO NOT MERGE 
Change-Id: I157884cf5f8c29c59f1365a28578d988a0a357a5
Auto-generated-cl: translation import
 2014-10-06 14:58:45 -07:00
Baligh Uddin
56541723bf Import translations. DO NOT MERGE 
Change-Id: I18962c620b68a9e1fa101aeda6f3511fb54af9c0
Auto-generated-cl: translation import
 2014-10-04 14:30:00 -07:00
Jorim Jaggi
23f0778983 am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev 
* commit '3c6300da713a7407a3fcfba126ef912ea7bc21bc':
  Fix blank Keyguard #4
 2014-10-04 00:11:22 +00:00
Jorim Jaggi
3c6300da71 am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev 
* commit 'eae1c3d5c1d7b292823c668eaedc72ffa707a5d6':
  Fix blank Keyguard #4
 2014-10-04 00:04:22 +00:00
Jorim Jaggi
8570139447 am a359df01: am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev 
* commit 'a359df01e012b194870d322fb1c16a6436d79f89':
  Fix blank lockscreen #3
 2014-10-03 23:57:33 +00:00
Jorim Jaggi
eae1c3d5c1 Merge "Fix blank Keyguard #4" into lmp-dev 2014-10-03 23:54:07 +00:00
Jorim Jaggi
a359df01e0 am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev 
* commit 'f009e3583f2843a463d75f06675ef18c398b0efd':
  Fix blank lockscreen #3
 2014-10-03 23:53:09 +00:00
Jorim Jaggi
5e08e6957d Fix blank Keyguard #4 
When we were fading out the preview for phone/camera to crossfade to
the real application, it might have been that showKeyguard was
called in the middle of this transition. This change makes sure that
we cancel this animation when showing the keyguard.

Bug: 17439581
Change-Id: I89cacf7ecf43d37ea979418b976390272510a09d
 2014-10-03 15:52:24 -07:00
Jorim Jaggi
f009e3583f Merge "Fix blank lockscreen #3" into lmp-dev 2014-10-03 22:33:06 +00:00
Elliott Hughes
1fb235aa9b Merge "Fix percentage formatting in SystemUI." into lmp-mr1-dev 2014-10-03 21:42:38 +00:00
Dianne Hackborn
02b4caf5f7 am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '02d758a9e83eb1da236f34a2a6b70af89941be43':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:33:08 +00:00
Jorim Jaggi
449981be16 Fix blank lockscreen #3 
Bug: 17439581
Change-Id: Ic8cb7f32200b541ecc8fa36ad2517975cec0b545
 2014-10-03 14:24:55 -07:00
Dianne Hackborn
02d758a9e8 am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '7caa51e6ec6443d5c1fdb96f7e42508b074b4278':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:02:42 +00:00
Dianne Hackborn
67f175cf07 Fix issue #17811029: Settings provider race when removing users 
Change-Id: Ia40d0a9c161b765d1340db5390d0acdbfc050b81
 2014-10-03 12:29:43 -07:00
Elliott Hughes
88d255107d Fix percentage formatting in SystemUI. 
Also remove some orphaned strings that tried to format percentages wrongly.

(The ar and fa localizations will be clobbered, but this lets you test this
change independently.)

Bug: 15476051
Change-Id: Ifd97d47446bdd2e95298b04e1a11542dfed7f9a1
 2014-10-03 12:06:17 -07:00
John Spurlock
0dbc6f328e am 7da91cc2: am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev 
* commit '7da91cc21f0f77277d76001af9133de3923ba686':
  Update framework icons for media & alarm streams.
 2014-10-03 14:05:47 +00:00
John Spurlock
7da91cc21f am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev 
* commit 'a79caa53405ea3efdd77d59ea7aa6dd64ecf09d3':
  Update framework icons for media & alarm streams.
 2014-10-03 14:00:29 +00:00
John Spurlock
4bebb1dc5e Update framework icons for media & alarm streams. 
Update resources to new style and remove obsolete items.

Bug: 17762712
Change-Id: Ibec121828084934cc066afe117f66b6a0eea603f
 2014-10-02 20:11:37 -04:00
Kenny Guy
27cee10057 am bdcfc01b: am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit 'bdcfc01b3bff1ff1c4237dccfb90704326890bee':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 17:00:42 +00:00
Kenny Guy
bdcfc01b3b am 3de09018: Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 
* commit '3de09018a9611b1791cc29ed5200b7d9694189a9':
  SettingsProvider should use correct cache when redirecting to user 0.
 2014-10-02 16:55:35 +00:00
Kenny Guy
3de09018a9 Merge "SettingsProvider should use correct cache when redirecting to user 0." into lmp-dev 2014-10-02 16:48:57 +00:00
Dianne Hackborn
ded96310cf am 796d6ece: am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit '796d6eced1e23217914e639da45d9371baf8a5b0':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:32:02 +00:00
Dianne Hackborn
796d6eced1 am c338784b: Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 
* commit 'c338784bf6bfcce3cd7db40f46b0e6c815e9ed3a':
  More work on issue #17656716: Unhandled exception in Window Manager
 2014-10-02 00:27:48 +00:00
Dianne Hackborn
c338784bf6 Merge "More work on issue #17656716: Unhandled exception in Window Manager" into lmp-dev 2014-10-02 00:23:18 +00:00
Erik Pasternak
c6646b0cb4 am 739bf81d: am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '739bf81dd130957c9bc09abc4e25732af2d675c0':
  Implement auto-sleep functionality.
 2014-10-02 00:09:47 +00:00
Erik Pasternak
739bf81dd1 am 4d82c46e: Merge "Implement auto-sleep functionality." into lmp-dev 
* commit '4d82c46ef5df06e1b92f3574e41b38a62ec0e607':
  Implement auto-sleep functionality.
 2014-10-02 00:04:01 +00:00
Erik Pasternak
4d82c46ef5 Merge "Implement auto-sleep functionality." into lmp-dev 2014-10-02 00:00:40 +00:00
Dianne Hackborn
8d05172112 More work on issue #17656716: Unhandled exception in Window Manager 
Fix Slog.wtf to not acquire the activity manager lock in its code
path, so that it can never deadlock.  This was the original intention
of it, but part was missed.

Now we can put back in the code to detect when strict mode data is
getting large (a little more targeted now to the actual problem),
and use Slog.wtf to report it.  And as a bonus, when this happens
we will now clear all of the collected violations, to avoid getting
in to the bad case where IPCs start failing.  So this should be
good enough for L to fix the problem, with wtf reports for us to
see if the underlying issue is still happening.

Finally, switch a butch of stuff in the system process from Log.wtf
to Slog.wtf, since many of those are deadlocks waiting to happen.

Oh and fix a crash in the settings provider I noticed in APR.

Change-Id: I307d51b7a4db238fd1e5fe2f3f9bf1b9c6f1c041
 2014-10-01 16:58:56 -07:00
John Spurlock
eac9f30c94 am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit '4940789b6c821bcbc25330536fe76a3fdd7e7983':
  Doze: Route volume keys to music only while pulsing.
 2014-10-01 22:17:52 +00:00
Winson Chung
0dad6a0732 am d8ab73d7: am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable th 
* commit 'd8ab73d71c50f8695ee8b671fdb838f2fd18790d':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
 2014-10-01 22:17:41 +00:00
Jeff Brown
05af6adb8d Implement auto-sleep functionality. 
Added a new SLEEP_TIMEOUT setting which governs how long the device will
remain awake or dreaming without user activity.  By default this
value is set to -1 which maintains today's existing behavior.

We basically represent the time we are allowed to be dreaming as a new
kind of user activity summary state called DREAM, similar to BRIGHT
and DIM.  When the sleep timeout expires, the state is cleared and
the dream ends.

Bug: 17665809
Change-Id: I59aa7648dcec215f1285464fc1134934a09230e5
 2014-10-01 15:01:10 -07:00
John Spurlock
4940789b6c am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit 'c403a340cbb097a95b35b198b27cf44c80a7242e':
  Doze: Route volume keys to music only while pulsing.
 2014-10-01 20:23:39 +00:00
John Spurlock
c403a340cb Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 2014-10-01 20:17:36 +00:00
Winson Chung
d8ab73d71c am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode o 
* commit 'd092fc7076310fca5edd089df5bb5398096f6627':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
 2014-10-01 20:07:38 +00:00
Winson Chung
d092fc7076 Merge "Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option" into lmp-dev 2014-10-01 20:03:19 +00:00
John Spurlock
0b99ea94f0 Doze: Route volume keys to music only while pulsing. 
Avoid waking up the device on hw vol key presses during a doze
pulse.  Instead, behave as if the screen was off for these keys,
namely forwarding them over to the session manager.

Bug:17672775
Change-Id: I566b93f0bdea79253ac3eca41d3876b271c61306
 2014-10-01 15:32:22 -04:00
Kenny Guy
a37d000c2b SettingsProvider should use correct cache when redirecting to user 0. 
SettingsProvider reads secure and system settings for managed
profiles from user 0 instead. However it still checks the cache
for the managed profile not user 0.

Bug: 17736586
Change-Id: I15d44b8a5779b01e6b9032e528dc34f5c5602449
 2014-10-01 19:18:18 +01:00
Winson Chung
9cb5c4e385 Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) 
- Fix regression with launching an affiliated task due to clipping changes (Bug 17755902)
- Tweaking previous changes to home transition
- Disable the debug mode option
 2014-10-01 17:48:05 +00:00
Selim Cinek
1c061d4862 am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit 'cdbda3e989c640aade8c9164b12b51f452792c29':
  Adapting translation length for a string in a dialog
 2014-10-01 17:20:37 +00:00
Selim Cinek
cdbda3e989 am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '15b2202bacdfcc249d7f51bcd3361e6694d24267':
  Adapting translation length for a string in a dialog
 2014-10-01 16:57:09 +00:00
Selim Cinek
15b2202bac Merge "Adapting translation length for a string in a dialog" into lmp-dev 2014-10-01 16:43:07 +00:00
Baligh Uddin
4aa820ce58 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-01 16:35:19 +00:00
Baligh Uddin
e575c819e5 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-01 16:35:15 +00:00
Baligh Uddin
ff99ff98cc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 16:35:13 +00:00
Vineeta Srivastava
3cc41b8edd am 533c9461: am ab1e241d: Merge "Show one name if both plmn and spn are equal" into lmp-dev 
* commit '533c9461569c171fbdfe51cff708c27c10302353':
  Show one name if both plmn and spn are equal
 2014-10-01 15:15:51 +00:00
Paul Jensen
18434fcc99 am a524b0f7: am 8df099df: Make CaptivePortalLogin app exit if underlying Network disconnects. 
* commit 'a524b0f7869c7dc9b5687721883acfd9a535e440':
  Make CaptivePortalLogin app exit if underlying Network disconnects.
 2014-10-01 15:14:45 +00:00
Winson Chung
3175f7d245 am 2396f135: am e3206407: Merge "Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)" into lmp-dev 
* commit '2396f135678e8a40b963904e8a6710bc6a204180':
  Fixing crash in Recents due to late onBootCompleted call (Bug 17572254)
 2014-10-01 15:14:34 +00:00
John Spurlock
eac6926f0c am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev 
* commit '260e6d542ff05094063f1a1574f41fa165308eef':
  Don't play hint animations when dozing
 2014-10-01 15:14:30 +00:00
Jason Monk
9e280c447f am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev 
* commit '15349991240bb9443d704b4ac85915f474e5108c':
  Pull roaming from mServiceState for consistency
 2014-10-01 15:14:26 +00:00
John Spurlock
3fd4440fea am af41d847: am ee98df79: Doze: Log screenOnFromTouch when flinging. 
* commit 'af41d8477a8152c0597630066207a863ad74614e':
  Doze: Log screenOnFromTouch when flinging.
 2014-10-01 15:14:18 +00:00