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

152456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
3ed2627569 am 033e2c3b: (-s ours) am 3bbb1ab1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '033e2c3bcf2940fc6def9d97775c262398198ed8':
  Import translations. DO NOT MERGE
 2014-09-18 18:50:39 +00:00
Baligh Uddin
4565d530ee am 4f72de2d: (-s ours) am eb5c1513: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '4f72de2d96769abae0edcfbc80e307ca18bed7bb':
  Import translations. DO NOT MERGE
 2014-09-18 18:50:35 +00:00
Baligh Uddin
71ef5474e1 am 97652d92: (-s ours) am 8ef42c07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '97652d925ba690a501d0f56a33171015fa9e82f7':
  Import translations. DO NOT MERGE
 2014-09-18 18:50:31 +00:00
Craig Mautner
5b23e88f77 am 654ddc13: am 64d2ee09: Merge "Don\'t remove active stacks from window manager" into lmp-dev 
* commit '654ddc130ddc1c09fd51d45570767fb028a03a73':
  Don't remove active stacks from window manager
 2014-09-18 18:50:28 +00:00
Alexandra Gherghina
2729013fdc am 15a1ce26: am de1871b2: Merge "Add new icon for managed provisioning" into lmp-dev 
* commit '15a1ce262e0f658f51745851d098b73802408291':
  Add new icon for managed provisioning
 2014-09-18 18:50:24 +00:00
Baligh Uddin
3f79b1639a am 3bbb1ab1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3bbb1ab13230ce13c93341dd58749f5bb37e7961':
  Import translations. DO NOT MERGE
 2014-09-18 18:34:10 +00:00
Baligh Uddin
d05f18e9f0 am eb5c1513: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'eb5c15132b5a4ac5b4de500fec836e9a5a493497':
  Import translations. DO NOT MERGE
 2014-09-18 18:34:06 +00:00
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
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
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
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
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
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
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
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
Adrian Roos
fda56feca0 am a92e765e: Merge "Fix bar visibility after restarting immersive activities" into lmp-dev 
* commit 'a92e765e1e764e6d34ca56b5617b00dc74a0e887':
  Fix bar visibility after restarting immersive activities
 2014-09-18 12:51:24 +00:00
Adrian Roos
763546a15a Merge "Don't crash if a user can't be created" into lmp-dev 2014-09-18 12:47:45 +00:00
Adrian Roos
44876e8df7 Merge "Fix bar visibility after restarting immersive activities" into lmp-dev 2014-09-18 12:40:52 +00:00
Alexandra Gherghina
e050122fd5 Fix broken svg icon 
We need to do this because the old svg had the middle part broken.

Bug: 17544362
Change-Id: I72438a889b6c6a3c1dd50675afe73406f4b49ce9
 2014-09-18 13:00:01 +01:00
Sander Alewijnse
b9d97b2edf am 2379e16f: am 81b375a1: Merge "Update targetSdkVersion check." into lmp-dev 
* commit '2379e16fbca0e6cbcdecbffb5be9799b3c755549':
  Update targetSdkVersion check.
 2014-09-18 11:59:44 +00:00
Dan Sandler
4fe666b5ce am d1c8a222: am 4aa2c14c: Merge "Living with the LLand." into lmp-dev 
* commit 'd1c8a2221d2b8ecfeabcba23536870a180768f7e':
  Living with the LLand.
 2014-09-18 11:59:41 +00:00