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

170335 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
503071ae41 am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit 'a2b5067aeef5b2d68a7a2f7b4edc7ee0908b5d5b':
  RRO: prevent duplicate system overlays
 2014-12-03 17:49:12 +00:00
Adam Lesinski
a2b5067aee Merge "RRO: prevent duplicate system overlays" 2014-12-03 17:44:18 +00:00
Trevor Johns
b769fc0c57 am 512103d6: am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs 
* commit '512103d62d932c882ff0c233787be1a902518585':
  Docs: Add "admin" to samples categories
 2014-12-03 17:30:27 +00:00
Trevor Johns
512103d62d am 19275484: Merge "Docs: Add "admin" to samples categories" into lmp-docs 
* commit '192754842cab0db73f2c1a4f9f78bfe37a84ce0d':
  Docs: Add "admin" to samples categories
 2014-12-03 17:20:52 +00:00
Adrian Roos
b67d8ef665 am f235edf2: Merge "Refresh user list a little more eagerly" into lmp-mr1-dev 
* commit 'f235edf21532c63f149ad8653a76558fba087f3e':
  Refresh user list a little more eagerly
 2014-12-03 17:19:35 +00:00
Svetoslav
5303451efc am 4667d247: Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev 
* commit '4667d247bbff30d7fe47a4022b91eb03da17be4d':
  Inconsistent media sizes for es-US locale.
 2014-12-03 17:19:29 +00:00
Jason Monk
d6b001f154 am 8d72046b: Merge "Don\'t show no sim icon on wifi devices" into lmp-mr1-dev 
* commit '8d72046b9ba06feadbcf71815a1c6e1017c8da37':
  Don't show no sim icon on wifi devices
 2014-12-03 17:19:24 +00:00
Daniel Sandler
b06074723f am 195c4388: Fixing bugs in the LLand. 
* commit '195c438883dfcca799aa456dfe52d24c077e40da':
  Fixing bugs in the LLand.
 2014-12-03 17:19:19 +00:00
Jinsuk Kim
5f23693b5c am 3f6755f5: CEC: Check command type for power status monitor action 
* commit '3f6755f58722bbae532171c384a294e530864ae1':
  CEC: Check command type for power status monitor action
 2014-12-03 17:19:14 +00:00
Craig Mautner
418eecb6f8 am dad92f36: Merge "Don\'t process windows belonging to unshown users" into lmp-mr1-dev 
* commit 'dad92f3668c8f153b4be946bed32c338c5fb6317':
  Don't process windows belonging to unshown users
 2014-12-03 17:19:01 +00:00
Lorenzo Colitti
d99cd44f31 am dc99c504: Merge "Make StatusBar display all default networks." into lmp-mr1-dev 
* commit 'dc99c50427ec700fa4b4191b92f0132cf7238c4b':
  Make StatusBar display all default networks.
 2014-12-03 17:18:52 +00:00
Adrian Roos
f235edf215 Merge "Refresh user list a little more eagerly" into lmp-mr1-dev 2014-12-03 17:13:56 +00:00
Geoff Mendal
a2d70616c0 Import translations. DO NOT MERGE 
Change-Id: Ia69522de8ce5f7afd94d1f60eb1152be766ed518
Auto-generated-cl: translation import
 2014-12-03 08:52:03 -08:00
Svetoslav
4667d247bb Merge "Inconsistent media sizes for es-US locale." into lmp-mr1-dev 2014-12-03 16:34:00 +00:00
Paul Jensen
7bd8eaf568 Retry failed network validation every 10 minutes. 
This allows for better recovery from ISP outages.

bug:18489123
Change-Id: Iefffe870bd6b7c19827fdbc323024a600a6025f9
 2014-12-03 11:06:14 -05:00
Geoff Mendal
56e814fdf7 Import translations. DO NOT MERGE 
Change-Id: I1d25beb300adec60caa70893b9dd4995e71fca0b
Auto-generated-cl: translation import
 2014-12-03 07:20:19 -08:00
Geoff Mendal
7494e13705 Import translations. DO NOT MERGE 
Change-Id: I05d1072828d3d0256c04101d22fab4a55c6530f2
Auto-generated-cl: translation import
 2014-12-03 06:31:39 -08:00
Geoff Mendal
97df114581 Import translations. DO NOT MERGE 
Change-Id: Iea99b1400da98c7af76027d54e0f9315c2726a5b
Auto-generated-cl: translation import
 2014-12-03 06:27:45 -08:00
Jason Monk
8d72046b9b Merge "Don't show no sim icon on wifi devices" into lmp-mr1-dev 2014-12-03 14:12:25 +00:00
Christoph Studer
85374052e3 RankingHelper: Remove STOPSHIP 
Remove obsolete debugging code that was marked STOPSHIP.

Bug: 17919719
Change-Id: I025410c191960382486456c9edd7675a14f0fa4b
 2014-12-03 15:12:02 +01:00
Daniel Sandler
195c438883 Fixing bugs in the LLand. 
less garish hue on the bugdroid
       :
  +----:-----------+
  | |  : |    Θ.......... improved pop styles
  | |  : @    |    |
  | O  A      |....... occasionally there was no gap to fly
  |      0    O    |   through, creating an unintentional
  | @    |    |    |   commentary on the futility of it all
  +----------------+
     :      :
     :      : animation could continue
     :        after activity pause, sapping
     :        precious cycles
     :
   failure is now more visceral

Bug: 17931806
Change-Id: Iea9bd88e340beb3a0ca310db071ec9f6ec719a33
 2014-12-03 11:53:29 +00:00
Trevor Johns
192754842c Merge "Docs: Add "admin" to samples categories" into lmp-docs 2014-12-03 09:29:49 +00:00
Jinsuk Kim
3f6755f587 CEC: Check command type for power status monitor action 
The action was not checking the command type before processing.
Makes sure the right command is given for the rest of the action flow.

Bug: 18592547
Change-Id: Iaf2584501fc70bfc87e00b74f48cb11c6989f283
 2014-12-03 08:06:39 +00:00
Baligh Uddin
8b2db65f1b am ee549e51: (-s ours) am 0fcd3f41: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'ee549e515eedb86ff29917f2c8760b665e30d1ee':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:57 +00:00
Baligh Uddin
1686b5c3f5 am 70b44364: (-s ours) am 925c27be: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '70b44364a1a0c7d6879670ead2fcbc7be02ec7f8':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:51 +00:00
Baligh Uddin
842556a450 am 204f2628: (-s ours) am 91426aa2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '204f26284cab010913829c412d39c7eee576080f':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:46 +00:00
Baligh Uddin
13b560996a am eb0fdf48: (-s ours) am ed338377: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'eb0fdf48b75c567666676bb0b01ae098ab471407':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:41 +00:00
Baligh Uddin
1348bad207 am c64e49ad: (-s ours) am 51bca143: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'c64e49adcab9b9f7680eeef8d33e18c30bda54c0':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:36 +00:00
Baligh Uddin
24c6982de4 am a221d299: (-s ours) am d33f84eb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'a221d299c0f9a6ec82daf91bcd7ac739eefe653a':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:31 +00:00
Baligh Uddin
d82f08196b am 42f0a843: (-s ours) am fccb3b43: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '42f0a8434636497737dae01db719908cc45910e4':
  Import translations. DO NOT MERGE
 2014-12-03 07:56:26 +00:00
Michael Wright
eb26c8ee2a am 4de2ab4c: am 7081a5d1: Merge "Correctly iterate through MediaProjection callbacks." into lmp-mr1-dev 
* commit '4de2ab4c55f74a7e166f58c7b7e72fc47c0d24c1':
  Correctly iterate through MediaProjection callbacks.
 2014-12-03 07:56:20 +00:00
Alan Viverette
4483f4611e am bb241c3c: am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev 
* commit 'bb241c3cdedb96d2a3a61e913102d6186f12103a':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
 2014-12-03 07:56:12 +00:00
Dan Sandler
e43bab74bc am 29f89da0: am dfb39ce3: Merge "Turn off DEBUG_GESTURES" into lmp-mr1-dev 
* commit '29f89da0a8a38dd060c8bd277d7473ccc3843185':
  Turn off DEBUG_GESTURES
 2014-12-03 07:56:07 +00:00
George Mount
a3a53251f1 am 24fac506: am 561261d4: Merge "Keep snapshot order matching the shared elements." into lmp-mr1-dev 
* commit '24fac506f0204433aa3d2314d3ac7f909b6eb67a':
  Keep snapshot order matching the shared elements.
 2014-12-03 07:56:00 +00:00
Sergii Skorokhodov
9edcc7be49 Correct check of is user running 
Before the ActivityManagerService sends an intent or
starts an activity it checks if target user is in
mStartedUsers array.

When removing a non-owner user process the
UserStartedState instance will still be in mStartedUsers
array with mState STOPPING or SHUTDOWN.

This should be checked before sending an intent or start
an activity.

isUserRunningLocked(...) will interpret mState STOPPING
and SHUTDOWN as a non running user.

Change-Id: I1b51bcdb62bdd0f6dbe05dab4d529d4ad40d0d44
 2014-12-03 08:36:26 +01:00
Craig Mautner
192d60488f Handle keyguard dismiss flags correctly 
When FLAG_SHOW_WHEN_LOCKED was set over an unsecure lockscreen the
behavior was incorrect. In such cases the lockscreen was not being
dismissed with or without FLAG_DISMISS_KEYGUARD. This change causes
the lockscreen to be dismissed when FLAG_SHOW_WHEN_LOCKED is set
over an insecure logckscreen.

Fixes bug 18563298.

Change-Id: Iba0d096a59789bf41332e109f1bd3e70834bbb83
 2014-12-02 23:24:48 -08:00
Craig Mautner
dad92f3668 Merge "Don't process windows belonging to unshown users" into lmp-mr1-dev 2014-12-03 07:16:37 +00:00
Lorenzo Colitti
dc99c50427 Merge "Make StatusBar display all default networks." into lmp-mr1-dev 2014-12-03 06:58:10 +00:00
Trevor Johns
25bc6be284 am e57dda11: am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit 'e57dda111ce0aeca025ddac252214726db2ce00e':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 03:04:48 +00:00
Trevor Johns
740b22a522 am 4263334b: am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '4263334bed38f1d8f3d0318f25cf37ba49926c02':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 03:04:44 +00:00
Filip Gruszczynski
0821a56668 am f675cad8: am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 
* commit 'f675cad8f5f5781a29ccd733570d90bae3fe8d84':
  Add overscan insets to surface frame dimensions in WallpaperService.
 2014-12-03 02:59:35 +00:00
Trevor Johns
e57dda111c am 5bd139bc: Merge "Docs: Remove NavigationDrawer sample from What\'s New page" into lmp-docs 
* commit '5bd139bcf09d51dfdd94a24ed9cdffd0c662df60':
  Docs: Remove NavigationDrawer sample from What's New page
 2014-12-03 02:56:57 +00:00
Trevor Johns
4263334bed am 6d54c699: Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 
* commit '6d54c699e8f86be9c7eb424849768ecc5f56993f':
  Docs: Remove GitHub links from docs/samples/new/index.html
 2014-12-03 02:56:54 +00:00
Filip Gruszczynski
f675cad8f5 am 6e854ce5: Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 
* commit '6e854ce5728086b3bd293cb37bd83ebeef52aca8':
  Add overscan insets to surface frame dimensions in WallpaperService.
 2014-12-03 02:53:41 +00:00
Dongwon Kang
25a0518806 am b0bbaec8: Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev 
* commit 'b0bbaec8bec519e85c33b4a25fa138e8017d6424':
  TIF: call tune() in HardwareSession
 2014-12-03 02:39:19 +00:00
Filip Gruszczynski
6e854ce572 Merge "Add overscan insets to surface frame dimensions in WallpaperService." into lmp-sprout-dev 2014-12-03 02:23:33 +00:00
Trevor Johns
5bd139bcf0 Merge "Docs: Remove NavigationDrawer sample from What's New page" into lmp-docs 2014-12-03 02:22:42 +00:00
Trevor Johns
6d54c699e8 Merge "Docs: Remove GitHub links from docs/samples/new/index.html" into lmp-docs 2014-12-03 02:22:27 +00:00
Dongwon Kang
b0bbaec8be Merge "TIF: call tune() in HardwareSession" into lmp-mr1-dev 2014-12-03 02:22:12 +00:00
Sanket Padawe
8e1b08ac26 am b13c12f5: Merge "Call entitlement on clicking tethering tile in quick settings." into lmp-mr1-dev 
* commit 'b13c12f58db3026ad30849873b3b6fc664f5ce7b':
  Call entitlement on clicking tethering tile in quick settings.
 2014-12-03 02:19:06 +00:00