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

11054 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
fa4eba9637 am 8ae85003: Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 
* commit '8ae8500365e71c59cbe96f600371391ac8d245b8':
  Update scrollbars to match Material spec
 2014-11-21 02:16:17 +00:00
Alan Viverette
8ae8500365 Merge "Update scrollbars to match Material spec" into lmp-mr1-dev 2014-11-21 02:12:10 +00:00
Alan Viverette
69b802fdb6 am 69fe1e8e: Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 
* commit '69fe1e8e5fef5ceac9aa476995623fe80424019d':
  Update overflow menu alignment to match spec
 2014-11-21 01:55:19 +00:00
Alan Viverette
69fe1e8e5f Merge "Update overflow menu alignment to match spec" into lmp-mr1-dev 2014-11-21 01:50:38 +00:00
Alan Viverette
16c5d2547b am 05275a2c: am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 
* commit '05275a2cbd2f31dbb098dc45a79379f1b7b964db':
  Add padding above and below dialog lists to match Material spec
 2014-11-21 01:38:21 +00:00
Alan Viverette
199ea8c0c7 Update overflow menu alignment to match spec 
BUG: 18417348
Change-Id: I5e4b1ca366c554bca33eac8e5403be6de72370f9
 2014-11-20 17:09:27 -08:00
RoboErik
216c089834 am 50b02d61: am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
* commit '50b02d61dca310dc8acaf83d25d919b436f6da43':
  Scale bitmaps in metadata sent to the system
 2014-11-21 00:43:33 +00:00
Alan Viverette
9eb4ee244b am e0a377f5: Merge "Make DeviceDefault alert dialog themes public" into lmp-mr1-dev 
* commit 'e0a377f50951d51b5ddf3be6f0ce361affdffc56':
  Make DeviceDefault alert dialog themes public
 2014-11-21 00:14:22 +00:00
Alan Viverette
7d5bcd7990 Update scrollbars to match Material spec 
Adds a minimum touch target size to the fast scroller so that we can
edge-align an 8dp thumb but still maintain a 48dp touch target.

BUG: 18467743
Change-Id: I31e9cf1948856f5fce7d75383b84a9359684ebe5
 2014-11-20 16:07:59 -08:00
Alan Viverette
8513453e37 Make DeviceDefault alert dialog themes public 
BUG: 18426645
Change-Id: Icd93dd4b153285e7636a59bec193b2fdf2d21da8
 2014-11-20 15:24:36 -08:00
Jorim Jaggi
c51fdd1bbf am bf1960ce: Merge "Fade notifications when exiting dozing" into lmp-mr1-dev 
automerge: 6456513

* commit '6456513f6ff844fd15f3453a66fcc8fb439e1ef7':
  Fade notifications when exiting dozing
 2014-11-20 21:31:41 +00:00
George Mount
e8a4055a09 am 485ac778: Merge "Slide supports Gravity.START and Gravity.END." into lmp-mr1-dev 
automerge: b883579

* commit 'b8835791e2d2fab41277597008010a5681dacb41':
  Slide supports Gravity.START and Gravity.END.
 2014-11-20 21:27:17 +00:00
Pavel Zhamaitsiak
950daf58af am c7ffe5e2: Merge "TTY over IMS: Add messages about change of TTY mode in the repote device" into lmp-mr1-dev 
automerge: 0208d3c

* commit '0208d3c8236af7c72d47c9c04ae1a79d0343559d':
  TTY over IMS: Add messages about change of TTY mode in the repote device
 2014-11-20 21:14:39 +00:00
Alan Viverette
8ee7fcd28b am b130d596: Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev 
automerge: 4247f06

* commit '4247f06ba43becfcdf7713b4b9fbc347c5b3361d':
  Remove underline and search icon from ActionBar search view
 2014-11-20 21:10:56 +00:00
Alan Viverette
ee53586acb am 552eca1a: Merge "Implement Material-style delegate for CalendarView" into lmp-mr1-dev 
automerge: 6a6b828

* commit '6a6b828090de26aeef7d11a7cc0513a813cbf3a9':
  Implement Material-style delegate for CalendarView
 2014-11-20 21:09:34 +00:00
Alan Viverette
499ea6b6d6 am d8dd5100: Merge "Fix several small layout and color issues" into lmp-mr1-dev 
automerge: 21aaf98

* commit '21aaf98f6fc666dcd2dad43c368038d441fefbb2':
  Fix several small layout and color issues
 2014-11-20 21:08:32 +00:00
John Spurlock
4adb8d496d am c70a4ccf: Merge "BatterySaver: Update disclosure string." into lmp-mr1-dev 
automerge: 61f4f68

* commit '61f4f685719b14f14479ebb6e7234ad30d320a7a':
  BatterySaver: Update disclosure string.
 2014-11-20 21:03:54 +00:00
Alan Viverette
05275a2cbd am 93da37a0: Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 
* commit '93da37a03b10eaa2971d04e5bbd86b79a154c46a':
  Add padding above and below dialog lists to match Material spec
 2014-11-20 19:21:06 +00:00
Alan Viverette
93da37a03b Merge "Add padding above and below dialog lists to match Material spec" into lmp-mr1-dev 2014-11-20 19:16:25 +00:00
RoboErik
50b02d61dc am 5b881d43: Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 
* commit '5b881d43ece280fdf46455a45393c3341e1feae7':
  Scale bitmaps in metadata sent to the system
 2014-11-20 18:04:54 +00:00
RoboErik
5b881d43ec Merge "Scale bitmaps in metadata sent to the system" into lmp-mr1-dev 2014-11-20 17:58:36 +00:00