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

11533 Commits

Author SHA1 Message Date
Alan Viverette
1e28c2272f am 93ca215b: am 8311f4d5: am ee222182: Merge "Ensure time picker HH:MM header is laid out left-to-right" into lmp-mr1-dev 
* commit '93ca215bf4a4ab855a14fe1d4f06405da8c51f0d':
  Ensure time picker HH:MM header is laid out left-to-right
 2014-11-26 19:41:39 +00:00
Alan Viverette
93ca215bf4 am 8311f4d5: am ee222182: Merge "Ensure time picker HH:MM header is laid out left-to-right" into lmp-mr1-dev 
* commit '8311f4d5c6370a7d816f67a9a71a07d6a7fc18c4':
  Ensure time picker HH:MM header is laid out left-to-right
 2014-11-26 18:41:25 +00:00
Alan Viverette
ee22218279 Merge "Ensure time picker HH:MM header is laid out left-to-right" into lmp-mr1-dev 2014-11-26 00:07:14 +00:00
Andres Morales
8f70a2558b am ffc71028: am 83f4847f: am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 
* commit 'ffc710281c38aba9546d200a25d6b19b0f85470a':
  Define permission for system apps to query size of block
 2014-11-25 18:51:42 +00:00
Alan Viverette
c0cdc00df2 am 3d0b7cdb: am 2bae3789: am ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 
* commit '3d0b7cdb661d29091ee789e5ca5e2e762edb0864':
  Update action bar insets on sw600dp to match Material spec
 2014-11-25 18:51:11 +00:00
Alan Viverette
37edd7d673 am bf7ef378: am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 
* commit 'bf7ef378980a7d5b9b231d6e75a70923e83eed8c':
  Update IME selection dialog layout for Material
 2014-11-25 18:51:06 +00:00
Andres Morales
ffc710281c am 83f4847f: am 59093d92: Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 
* commit '83f4847f7b842fafec74fad85878e36b19dfef9f':
  Define permission for system apps to query size of block
 2014-11-25 18:46:15 +00:00
Alan Viverette
3d0b7cdb66 am 2bae3789: am ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 
* commit '2bae3789da18676cabf2e09e49c519fa96184a81':
  Update action bar insets on sw600dp to match Material spec
 2014-11-25 18:44:48 +00:00
Alan Viverette
bf7ef37898 am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 
* commit '0e8aabd6c9dfef168a6de714219fc52ecaca08ea':
  Update IME selection dialog layout for Material
 2014-11-25 18:44:42 +00:00
Jeff Sharkey
eb9d22bb3d am c02f304c: am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit 'c02f304c3a1dc45a7e44b9f91b38c62353850d30':
  Introduce revision codes for split APKs.
 2014-11-25 17:49:24 +00:00
Amit Mahajan
1d9d52c180 am 0e6d836e: am ed7ccb45: am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 
* commit '0e6d836efa56d49638d9a830258130cc4fc6f626':
  Set network selection to automatic when in Global mode
 2014-11-25 17:48:41 +00:00
Dianne Hackborn
475615b583 am 14dd6ebf: am d65cb228: am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit '14dd6ebff64af8d991680b7dda2286cd1d578c06':
  Final resource IDs.
 2014-11-25 17:48:30 +00:00
Jeff Sharkey
c02f304c3a am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit '58b699c366dea7abc26f34c1e5f1cc6031c04e23':
  Introduce revision codes for split APKs.
 2014-11-25 17:39:16 +00:00
Amit Mahajan
0e6d836efa am ed7ccb45: am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 
* commit 'ed7ccb45c0ffe5de22af68904ddba4f515eb3f10':
  Set network selection to automatic when in Global mode
 2014-11-25 17:37:37 +00:00
Dianne Hackborn
14dd6ebff6 am d65cb228: am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit 'd65cb22872b5dbfb5937d66191b60be22b63fd21':
  Final resource IDs.
 2014-11-25 17:36:58 +00:00
Andres Morales
59093d925d Merge "Define permission for system apps to query size of block" into lmp-mr1-dev 2014-11-25 17:35:21 +00:00
Andres Morales
6b0c7acd7f Define permission for system apps to query size of block 
Allows ManagedProvisioning to determine whether there's a
challenge and thus whether to disable NFC provisioning.

Other implementation option: new hidden boolean API method.
Can't think of benefit of new API method "isBlockInUse", other
than doesn't leak PDB size and is more explicitly tied to the
use case. Open to either impl if anyone has opinions on the matter.

Bug: 18508767
Change-Id: I28d2eb5a0837ff85cb91f140b17ce1dd843fe9d6
 2014-11-25 15:55:28 +00:00
Alan Viverette
ada19e6de6 Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 2014-11-25 00:54:05 +00:00
Alan Viverette
662039c687 Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 2014-11-25 00:53:43 +00:00
Alan Viverette
3ed7dbaf32 Ensure time picker HH:MM header is laid out left-to-right 
BUG: 18509792
Change-Id: Iae06469a7a9d019752b869fbd980a9451b2c63b6
 2014-11-24 16:12:44 -08:00
Alan Viverette
505e3abb8d Update IME selection dialog layout for Material 
Also cleans up simple_list_item_2.xml formatting.

BUG: 18314215
Change-Id: I12b6ff19fca891524da7137b85dd576f85ee266a
 2014-11-24 15:22:11 -08:00
Alan Viverette
3c9012b9ba Update action bar insets on sw600dp to match Material spec 
BUG: 18482784
Change-Id: Ic9dbca11e9fbf850ad017e1a4c7b72030bf35ddc
 2014-11-24 14:37:46 -08:00
Jeff Sharkey
88d2a3c0e1 Introduce revision codes for split APKs. 
Apps delivered as multiple split APKs must have identical package
names, version code, and signatures.  However, developers may want
to iterate quickly on a subset of splits without having to increment
the version code, which would require delivery of the entire app.

This change introduces "revision codes" which can vary between
split APKs belonging to the same app.  An install is valid as long
as the normal version code is identical across all splits.  Splits
can be added/removed to an app over time, but if a split is present
across an upgrade the revision code must not decrease.

Since system apps could have been updated with splits, only revert
to the built-in APKs if the version code is strictly greater than the
data version.  Also fix bug to enable inheriting from system apps
when adding splits.

Bug: 18481866
Change-Id: I34d8e14c141a8eb95c33ffe24b4e52d6af5c8260
 2014-11-24 12:13:11 -08:00
Geoff Mendal
f5699ac4a3 Import translations. DO NOT MERGE 
Change-Id: Iff6ca995e53ce60b260cdd7577271ee08f11924c
Auto-generated-cl: translation import
 2014-11-24 11:01:19 -08:00
Amit Mahajan
7734836508 Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 2014-11-24 18:22:02 +00:00
Dianne Hackborn
2bbea56d12 Merge "Final resource IDs." into lmp-mr1-dev 2014-11-24 17:54:06 +00:00
Geoff Mendal
9be80ee53f Import translations. DO NOT MERGE 
Change-Id: I0cddd5a38892d51d9ceb338f039e360dddc877bf
Auto-generated-cl: translation import
 2014-11-24 07:13:23 -08:00
a20023
bcb78eec88 Set network selection to automatic when in Global mode 
Verzion requests that network selection should be set to automatic when 
network mode is global.

Bug: 18372726
Change-Id: I58aae223e15351efc3f58a938630f0aa9600537e
 2014-11-24 02:34:08 +00:00
Sanket Padawe
d96712d05d am b3498581: am 8e2e6683: am ab4a940a: Merge "Make default carrier name string look better." into lmp-mr1-dev 
* commit 'b34985813d1e186dd96f6cca86ae748a4758e135':
  Make default carrier name string look better.
 2014-11-22 02:42:15 +00:00
Sanket Padawe
b34985813d am 8e2e6683: am ab4a940a: Merge "Make default carrier name string look better." into lmp-mr1-dev 
* commit '8e2e6683e3f4830a45474a70f5043f1fcd84f890':
  Make default carrier name string look better.
 2014-11-22 02:33:13 +00:00
Dianne Hackborn
b2411f77ca Final resource IDs. 
Change-Id: Ie4b811f2a914191dded8de1b3d6321cff4db882c
 2014-11-21 17:04:53 -08:00
Sanket Padawe
8e2e6683e3 am ab4a940a: Merge "Make default carrier name string look better." into lmp-mr1-dev 
* commit 'ab4a940a8ae4a5fb63a84fa51527b7703e7bfc88':
  Make default carrier name string look better.
 2014-11-21 23:37:57 +00:00
Sanket Padawe
ab4a940a8a Merge "Make default carrier name string look better." into lmp-mr1-dev 2014-11-21 23:33:26 +00:00
Bryce Lee
2388c814a0 am 296ea917: am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit '296ea9174222e64085a66a238e6df13b8b378b1e':
  Make default windows features configurable.
 2014-11-21 22:33:01 +00:00
Bryce Lee
296ea91742 am deee5566: am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'deee5566417af229a142cf8c1964e98a356513e4':
  Make default windows features configurable.
 2014-11-21 19:27:55 +00:00
Bryce Lee
deee556641 am d45cedd6: Merge "Make default windows features configurable." into lmp-mr1-dev 
* commit 'd45cedd6f5efd141be08ce4ffcecf478fbedb056':
  Make default windows features configurable.
 2014-11-21 19:21:25 +00:00
Bryce Lee
d45cedd6f5 Merge "Make default windows features configurable." into lmp-mr1-dev 2014-11-21 19:18:50 +00:00
Bryce Lee
d6e6e7235a Make default windows features configurable. 
Bug: 18434078
Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
 2014-11-21 11:08:45 -08:00
Rubin Xu
f6a1ef1d7b am 55a05e4d: am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
automerge: 83f2f47

* commit '83f2f4795060352886943fff714ff14030bfdc9a':
  String literals for CL ag/586597
 2014-11-21 18:25:13 +00:00
Rubin Xu
83f2f47950 am 55a05e4d: am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
* commit '55a05e4d35c0886733586db0d5aa1af5030d35a7':
  String literals for CL ag/586597
 2014-11-21 17:59:49 +00:00
Rubin Xu
55a05e4d35 am b90a2f9d: Merge "String literals for CL ag/586597" into lmp-mr1-dev 
* commit 'b90a2f9d1a58586ef8215176bae22ac6dc4eaee3':
  String literals for CL ag/586597
 2014-11-21 17:54:26 +00:00
Rubin Xu
b90a2f9d1a Merge "String literals for CL ag/586597" into lmp-mr1-dev 2014-11-21 17:50:23 +00:00
Rubin Xu
7f9e014b00 String literals for CL ag/586597 
Mini-CL to get the strings in for translations.

Bug: 17657954
Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
 2014-11-21 17:04:11 +00:00
Alan Viverette
d679cf04de am ac280c48: am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev automerge: fa4eba9 
* commit 'ac280c48d05c4d23f0d2b0e2622376b374198fef':
  Update scrollbars to match Material spec
 2014-11-21 12:18:26 +00:00
Alan Viverette
ced4c827af am a35d07a4: am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev automerge: 69b802f 
* commit 'a35d07a4f0bb743e03fc5422b45851e639c2f0a8':
  Update overflow menu alignment to match spec
 2014-11-21 12:18:21 +00:00
Alan Viverette
2c44d8ab1f am ea28d459: am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev automerge: 9eb4ee24 
* commit 'ea28d4594d24c118def2f16ee98b771d5e704f69':
  Make DeviceDefault alert dialog themes public
 2014-11-21 12:18:00 +00:00
Alan Viverette
ac280c48d0 am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 
automerge: fa4eba9

* commit 'fa4eba96374b971c13ee6427c74a78503c958757':
  Update scrollbars to match Material spec
 2014-11-21 03:03:46 +00:00
Alan Viverette
a35d07a4f0 am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 
automerge: 69b802f

* commit '69b802fdb6a5920bb0bd0270298450ede52dcaf1':
  Update overflow menu alignment to match spec
 2014-11-21 03:02:39 +00:00
Alan Viverette
ea28d4594d am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev 
automerge: 9eb4ee24

* commit '9eb4ee244beb124c0e81d73126376ec8350984c6':
  Make DeviceDefault alert dialog themes public
 2014-11-21 02:58:24 +00:00
Alan Viverette
d250fc5915 am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 
automerge: 16c5d25

* commit '16c5d2547b1fc1e15f6d2b62bf5c8c706506a16e':
  Add padding above and below dialog lists to match Material spec
 2014-11-21 02:22:40 +00:00