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

152777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
5c10a9b962 am 8ef42c07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '8ef42c07e8ba05e3d97e078426210af64441f0c7':
  Import translations. DO NOT MERGE
 2014-09-18 18:34:02 +00:00
Jorim Jaggi
a8433c6512 Merge "Add option for recents to use fake shadows" into lmp-dev 2014-09-18 18:33:42 +00:00
Craig Mautner
c6ad70c1be am 64d2ee09: Merge "Don\'t remove active stacks from window manager" into lmp-dev 
* commit '64d2ee0982bfe4ef8186cb43236550a161d6f038':
  Don't remove active stacks from window manager
 2014-09-18 18:33:40 +00:00
Alexandra Gherghina
5fa9c8a3b9 am de1871b2: Merge "Add new icon for managed provisioning" into lmp-dev 
* commit 'de1871b26d9cec542268a81c84f5380f6de86edf':
  Add new icon for managed provisioning
 2014-09-18 18:33:35 +00:00
Selim Cinek
9aefd41557 Merge "Removed round rect clipping and hardware layers from recents" into lmp-dev 2014-09-18 18:33:26 +00:00
Dianne Hackborn
a150a8bc71 Lock in final resource IDs. 
Change-Id: I6da2c05737b7bc361a7c6f0862166f05de86c63f
 2014-09-18 11:32:39 -07:00
Adrian Roos
595f6d912a Merge "Reinitialize emergency calls only view if configuration changes" into lmp-dev 2014-09-18 18:32:07 +00:00
Jason Monk
d127e58e41 Merge "Add material camera_click sound" into lmp-dev 2014-09-18 18:29:52 +00:00
Jon Miranda
e82a4eeb40 Adds support for Theme dumping via DDM. 
Bug: 17515415
Change-Id: Ice145a4b452177e36345cf2e071377bb7b3feeb3
 2014-09-18 11:29:08 -07:00
Jason Monk
3ad242df72 Block QS in sec. users setup when simple 
When simple user switcher is enabled block QS for secondary users
during setup.

Bug: 16782635
Change-Id: Ibc39c61675f8728d73a5f8ef04d0613ff36af909
 2014-09-18 18:26:39 +00:00
George Mount
cc82424b44 Fix broken logic in isValidTarget 
Bug 17553253

Change-Id: I9f3f2c80e59128fd5f8d4b1b2a67692c00804f62
 2014-09-18 11:21:09 -07:00
Baligh Uddin
d360d9ab24 am 6cf656c8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '6cf656c88f20c12ef90c457b47ade0da6b3d184e':
  Import translations. DO NOT MERGE
 2014-09-18 18:17:17 +00:00
Baligh Uddin
d56ec18686 am 94b8e870: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '94b8e87065d1607c791e214f57107bac4927de23':
  Import translations. DO NOT MERGE
 2014-09-18 18:17:14 +00:00
Baligh Uddin
439092001c am c9af7854: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'c9af78545fc715a0853d3cd6dce3c35127f1e2e0':
  Import translations. DO NOT MERGE
 2014-09-18 18:17:10 +00:00
Baligh Uddin
6e91f3f6b2 am a2fd133e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'a2fd133ee5e357a8ab2d526e667210aba10cdb8d':
  Import translations. DO NOT MERGE
 2014-09-18 18:17:07 +00:00
Esteban Talavera
c5bf65aa96 Merge "Make dpm command output more test friendly" into lmp-dev 2014-09-18 18:15:49 +00:00
Baligh Uddin
0449acb706 am bfcaeef2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'bfcaeef2aef684ebd39b39a53b19ad1068375e47':
  Import translations. DO NOT MERGE
 2014-09-18 18:12:50 +00:00
Baligh Uddin
838c4b5c7c Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-18 18:10:49 +00:00
Baligh Uddin
6a65bc4126 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-18 18:10:48 +00:00
Baligh Uddin
bd8dfd52e2 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-18 18:10:39 +00:00
Baligh Uddin
92f0205abd Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-18 18:10:19 +00:00
Baligh Uddin
61e7929a70 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-18 18:10:15 +00:00
Baligh Uddin
07abdd6e45 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-18 18:09:43 +00:00
Baligh Uddin
6641c1051f Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-18 18:00:17 +00:00
Baligh Uddin
2f70e40f34 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-09-18 18:00:16 +00:00
Esteban Talavera
c48bca50fa Make dpm command output more test friendly 
Added 'Success' at the beginning of the command output every time
it didn't fail, so that we can easily check the output in tests.
The command is brand new, only used by us on CTS tests, so this
shouldn't break anybody.

Bug: 17312478
Change-Id: Ie67bf5b2f44e658e7009e5bd87f8cb81be515584
 2014-09-18 18:32:45 +01:00
Craig Mautner
103b143ecd Merge "Don't remove active stacks from window manager" into lmp-dev 2014-09-18 17:20:51 +00:00
George Mount
717a88435b am 39da65b2: am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev 
* commit '39da65b24d3e1e7ffcd52b64fa65f18cffc4650e':
  Default to using hardware layer during fade transition.
 2014-09-18 17:18:22 +00:00
George Mount
510ca08d9e am b029590f: Merge "Default to using hardware layer during fade transition." into lmp-dev 
* commit 'b029590fdbba56b5e09dc2e48b4045aefadcf26f':
  Default to using hardware layer during fade transition.
 2014-09-18 17:09:12 +00:00
Alexandra Gherghina
1067b6e7ed Merge "Add new icon for managed provisioning" into lmp-dev 2014-09-18 17:07:13 +00:00
George Mount
48af9ddbb6 Merge "Default to using hardware layer during fade transition." into lmp-dev 2014-09-18 16:56:46 +00:00
Jason Monk
3240988105 Add material camera_click sound 
Bug: 17281234
Change-Id: I3f9a7592cfe8171fcae44ea075bf7faafaa482fe
 2014-09-18 12:46:10 -04:00
Shri Borde
6244215e27 am 7e7619bd: Merge "Unhide SUB_ID column from Mms, Carriers and PendingMessages" into lmp-sprout-dev 
* commit '7e7619bd82bab9770d21d0690f03e34b1b9e4f61':
  Unhide SUB_ID column from Mms, Carriers and PendingMessages
 2014-09-18 16:43:36 +00:00
Jason Monk
42fd003923 am bc0a997a: am 0df576ee: Merge "Fix crash from USER_PRESENT broadcast in sysui" into lmp-dev 
* commit 'bc0a997a31406a11d0d913fdf155d4089eec07a1':
  Fix crash from USER_PRESENT broadcast in sysui
 2014-09-18 16:43:32 +00:00
Shri Borde
f27222098c Merge "Unhide SUB_ID column from Mms, Carriers and PendingMessages" into lmp-sprout-dev 2014-09-18 16:40:07 +00:00
Jason Monk
2b18589c6f am 0df576ee: Merge "Fix crash from USER_PRESENT broadcast in sysui" into lmp-dev 
* commit '0df576eeb87d234ce6818b6afb48501cc2c31bbf':
  Fix crash from USER_PRESENT broadcast in sysui
 2014-09-18 16:29:04 +00:00
Jason Monk
2bc75f0821 Merge "Fix crash from USER_PRESENT broadcast in sysui" into lmp-dev 2014-09-18 16:12:06 +00:00
Adrian Roos
9a39dd8ee7 am 9f9aab43: am 3f30fcc8: Fix wrong face unlock size 
* commit '9f9aab4381d44dfc32cc54e166d0f03cc62a5175':
  Fix wrong face unlock size
 2014-09-18 16:01:08 +00:00
Adrian Roos
7111781812 am 3f30fcc8: Fix wrong face unlock size 
* commit '3f30fcc8ed023be299af13d8ea5300f2712b9f48':
  Fix wrong face unlock size
 2014-09-18 15:50:33 +00:00
Kenny Guy
d00cfc51fb Remove suggested key names as its confusing. 
Update java doc to not suggest package names
as it confused people into thinking it would
limit access to that package which isn't the
case.

Bug: 15177676
Change-Id: I0736976956d8bb604e5097326c8c4316b3007d64
 2014-09-18 16:34:45 +01:00
Adrian Roos
72cc3702d2 Fix wrong face unlock size 
Bug: 17533062
Change-Id: I532d7197fcd59baffd8f6c4e76a9fb8eda389eac
 2014-09-18 17:25:09 +02:00
Alexandra Gherghina
f8d9eb58f6 Add new icon for managed provisioning 
This will be used for managed provisioning notifications and status
bar.

Bug: 17521583
Change-Id: Ic92d52a6a6366ca696ee85f42325f64ecce744b9
 2014-09-18 16:16:14 +01:00
Jason Monk
cf5a9530f7 Fix crash from USER_PRESENT broadcast in sysui 
Since sending the USER_PRESENT broadcast too early in the boot
process can result in a SecurityException, don't do auto-unlock
until after the boot has completed.

Bug: 17464800
Change-Id: Iee3d0b9723ed38abddf0bdde009f95331881008b
 2014-09-18 11:02:19 -04:00
Alexandra Gherghina
a7c4ed79ba am 3e1aae70: am 70a21738: Merge "Fix broken svg icon" into lmp-dev 
* commit '3e1aae70d98b4697f92a62d5a471328fa1caf4ef':
  Fix broken svg icon
 2014-09-18 13:28:30 +00:00
Alexandra Gherghina
c6e51879a8 am 70a21738: Merge "Fix broken svg icon" into lmp-dev 
* commit '70a217383c33bdc0f01a25660a6dd559d4af386a':
  Fix broken svg icon
 2014-09-18 13:17:38 +00:00
Alexandra Gherghina
a300fca9b8 Merge "Fix broken svg icon" into lmp-dev 2014-09-18 13:07:27 +00:00
Adrian Roos
f578724696 am b24fee8f: am 92026680: Merge "Don\'t crash if a user can\'t be created" into lmp-dev 
* commit 'b24fee8faf9be0d305a5a8f456cbfbc27384a7f7':
  Don't crash if a user can't be created
 2014-09-18 13:01:06 +00:00
Adrian Roos
ef9941cdad am 5d294516: am a92e765e: Merge "Fix bar visibility after restarting immersive activities" into lmp-dev 
* commit '5d29451624fe4997d48cc2ff06558473632cb252':
  Fix bar visibility after restarting immersive activities
 2014-09-18 13:01:02 +00:00
Winson Chung
397157ce9c Additional check to determine insets for recents animation 
Bug: 17555722

Change-Id: I1474de7960dfebbdd32f159ace6677019a6b87a5
 2014-09-18 12:51:48 +00:00
Adrian Roos
c82d32e92d am 92026680: Merge "Don\'t crash if a user can\'t be created" into lmp-dev 
* commit '92026680fc32d51f8ceecb4c4c66a98c6d14c0ed':
  Don't crash if a user can't be created
 2014-09-18 12:51:28 +00:00