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

152655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martijn Coenen
b76814f418 am 7142afa9: am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev 
* commit '7142afa92a41a7aad2d0f4a91177532b425b6f0f':
  Upper-case incoming AIDs.
 2014-09-18 19:09:42 +00:00
Nancy Chen
02d07faa21 am 0274ed08: am 93c75e45: Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev 
* commit '0274ed08fd02412d8aaa555dfed6d297e1bef109':
  Replace get*PhoneAccounts* public API methods with new method (1/3)
 2014-09-18 19:09:38 +00:00
Martijn Coenen
9cba2fff2f am 15af6c4e: Merge "Upper-case incoming AIDs." into lmp-dev 
* commit '15af6c4e0717b49b84ea32159fea7e4b7ceb48a6':
  Upper-case incoming AIDs.
 2014-09-18 19:00:20 +00:00
Nancy Chen
6810fb95a3 am 93c75e45: Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev 
* commit '93c75e4567a727636d26e7e386a78a883e649e48':
  Replace get*PhoneAccounts* public API methods with new method (1/3)
 2014-09-18 18:54:37 +00:00
Martijn Coenen
da6ffa06b7 Merge "Upper-case incoming AIDs." into lmp-dev 2014-09-18 18:52:57 +00:00
Winson Chung
27ac4e4806 am 2b8ef1ba: am f7093202: Enabling recents stack clipping 
* commit '2b8ef1ba7d2f9277a1a45f0534356e5472cd9211':
  Enabling recents stack clipping
 2014-09-18 18:51:15 +00:00
Jorim Jaggi
21d23ea270 am f107e2b5: am 4615fa60: Merge "Add option for recents to use fake shadows" into lmp-dev 
* commit 'f107e2b51b9d1db230edb49bdd5752ec86a5f445':
  Add option for recents to use fake shadows
 2014-09-18 18:51:12 +00:00
Selim Cinek
af9662ba43 am 1f90c017: am 25e58cf8: Merge "Removed round rect clipping and hardware layers from recents" into lmp-dev 
* commit '1f90c017ce54f7d289638771f7025e2ddd8f76f9':
  Removed round rect clipping and hardware layers from recents
 2014-09-18 18:51:03 +00:00
Adrian Roos
4fbb72262e am aac6a7d6: am 1c080f10: Merge "Reinitialize emergency calls only view if configuration changes" into lmp-dev 
* commit 'aac6a7d666fde99ab18cd88258ba9958dfba5448':
  Reinitialize emergency calls only view if configuration changes
 2014-09-18 18:50:54 +00:00
Jason Monk
77afd703f4 am 70555210: am 5793422f: Merge "Add material camera_click sound" into lmp-dev 
* commit '7055521077ea8a18a22451ec0bdb48b96a6c9339':
  Add material camera_click sound
 2014-09-18 18:50:50 +00:00
Jason Monk
ad61c96189 am 43d12acb: am b682d08a: Block QS in sec. users setup when simple 
* commit '43d12acb14c5566b025b04e9812f02d39268d845':
  Block QS in sec. users setup when simple
 2014-09-18 18:50:46 +00:00
Esteban Talavera
d3c5cb8f38 am 9cc0285e: am a9744790: Merge "Make dpm command output more test friendly" into lmp-dev 
* commit '9cc0285e37f7c0330847b693ebf3ca50f97dce23':
  Make dpm command output more test friendly
 2014-09-18 18:50:42 +00:00
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
Nancy Chen
7118220cff Merge "Replace get*PhoneAccounts* public API methods with new method (1/3)" into lmp-dev 2014-09-18 18:46:43 +00:00
Winson Chung
e274b8f711 am f7093202: Enabling recents stack clipping 
* commit 'f709320263f370145780270fdc825cfbc48912d1':
  Enabling recents stack clipping
 2014-09-18 18:44:44 +00:00
Jorim Jaggi
9a3fa7a5b5 am 4615fa60: Merge "Add option for recents to use fake shadows" into lmp-dev 
* commit '4615fa60c76a11d9492e01d7b8d434f857ebc52a':
  Add option for recents to use fake shadows
 2014-09-18 18:44:39 +00:00
Selim Cinek
a15f1e2fc3 am 25e58cf8: Merge "Removed round rect clipping and hardware layers from recents" into lmp-dev 
* commit '25e58cf8faf937b679ab9359f9da7583b6cdf542':
  Removed round rect clipping and hardware layers from recents
 2014-09-18 18:44:36 +00:00
Adrian Roos
51f43df10c am 1c080f10: Merge "Reinitialize emergency calls only view if configuration changes" into lmp-dev 
* commit '1c080f10730802878b0d6718e5aefef3f256fcd0':
  Reinitialize emergency calls only view if configuration changes
 2014-09-18 18:44:32 +00:00
Jason Monk
c91786ba94 am 5793422f: Merge "Add material camera_click sound" into lmp-dev 
* commit '5793422f78573361cc0078e575ce36d8a41d934c':
  Add material camera_click sound
 2014-09-18 18:44:28 +00:00
Jason Monk
21956c773b am b682d08a: Block QS in sec. users setup when simple 
* commit 'b682d08a4162f3abf601040c700e877472f96193':
  Block QS in sec. users setup when simple
 2014-09-18 18:44:19 +00:00
Ye Wen
d572e4504d Add new error result code for mms config loading failure (1/2) 
b/17556258

Change-Id: I589a7b77be215dc98fb9f2c9b1a04cac5ee53558
 2014-09-18 11:42:45 -07:00
Esteban Talavera
9b73513ba3 am a9744790: Merge "Make dpm command output more test friendly" into lmp-dev 
* commit 'a97447905d8f2480885112288bcee1c4c126d45e':
  Make dpm command output more test friendly
 2014-09-18 18:34:19 +00:00
Winson Chung
bf5dbf1c15 Enabling recents stack clipping 
The taskviews now avoid overdraw by clipping invisible
parts. Also adapted some timings of the animation.

Bug: 17455301
Change-Id: Ifbf7bab363e530cb2ad842baed50fc16dcfcc4c4
 2014-09-18 18:34:17 +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
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