Andrew Sapperstein
5271166556
Update Theme.DialogWhenLarge to use theme colors. am: ddc21c0fb1
...
am: 1883bc5c3c
* commit '1883bc5c3c646e1512623258d804b7f4175dac44':
Update Theme.DialogWhenLarge to use theme colors.
Change-Id: I5fed7a3029b150e4c9ce95562e049816c64ce875
2016-05-25 03:48:34 +00:00
Andrew Sapperstein
390f6c29b1
Update alertDialogTheme to use proper colorAccent. am: 8da144bdee
...
am: 542c63384c
* commit '542c63384cd8133713a17f3403a4632e2fabd2bd':
Update alertDialogTheme to use proper colorAccent.
Change-Id: I788874513a6d6525a352cf780d1d85abbe638aec
2016-05-25 03:48:33 +00:00
Andrew Sapperstein
1883bc5c3c
Update Theme.DialogWhenLarge to use theme colors.
...
am: ddc21c0fb1
* commit 'ddc21c0fb19b0ec2365ac650e833f1980b0f35b2':
Update Theme.DialogWhenLarge to use theme colors.
Change-Id: Id4ca795b39edef90119d46ebe3f4b6f4bb93f29b
2016-05-25 03:45:41 +00:00
Andrew Sapperstein
542c63384c
Update alertDialogTheme to use proper colorAccent.
...
am: 8da144bdee
* commit '8da144bdee8d6fcf90a5b42e2e726a5a3d05c82d':
Update alertDialogTheme to use proper colorAccent.
Change-Id: I8e7790a5c7293bf81881ed5e14335e0840bedba6
2016-05-25 03:45:40 +00:00
Andrew Sapperstein
ddc21c0fb1
Update Theme.DialogWhenLarge to use theme colors.
...
This theme is at least used by the Phone Status activity and probably
others as well.
BUG: 28760785
Change-Id: If3faa84ad9d291f007c7191f1c0dba8d98fe9bf8
2016-05-24 18:08:36 -07:00
Andrew Sapperstein
8da144bdee
Update alertDialogTheme to use proper colorAccent.
...
The settings dialogs were all using the default colorAccent.
Now it uses the app's version.
BUG: 28760785
Change-Id: Ic9bf90745db7d2ef5b1fd047474bab5c6bbdab23
2016-05-24 18:08:36 -07:00
Adrian Roos
2018df601d
Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9
am: 4b3ab5871c
...
am: aa98d45059
* commit 'aa98d450595df191c0d23fed9293094df71eba27':
Change-Id: I5f64fdf20b2d195448f2ad565cf556b5db92e37f
2016-05-25 00:43:45 +00:00
Adrian Roos
f1677e4c0b
Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9
am: aea945a821
...
am: 7226630b67
* commit '7226630b6797121c6a7dcabcceefc0177de46366':
Remove option to configure emergency app
Change-Id: Ia9f11c4099cb58c5d4e318f050fe70301f19fb91
2016-05-25 00:43:42 +00:00
Adrian Roos
aa98d45059
Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9
...
am: 4b3ab5871c
* commit '4b3ab5871c0869eb0f51a08a6bc9aceede856090':
Change-Id: I2488f70caa3b2a735d02b16decba07d25a6af272
2016-05-25 00:35:41 +00:00
Adrian Roos
7226630b67
Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9
...
am: aea945a821
* commit 'aea945a82133cfc2704c14b214fd93e06624f4f3':
Remove option to configure emergency app
Change-Id: I6fd3b85f96e22fb85960fcad56e09b8f8b0eef70
2016-05-25 00:31:58 +00:00
Adrian Roos
aea945a821
Merge "Remove option to configure emergency app" into nyc-dev
...
am: 06b7d7cdf9
* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
Remove option to configure emergency app
Change-Id: I4643f4cae85c6e70d82a8a25f34c2f17305b240d
2016-05-25 00:23:29 +00:00
Adrian Roos
4b3ab5871c
Merge "Remove option to configure emergency app" into nyc-dev
...
am: 06b7d7cdf9
* commit '06b7d7cdf954902dad8fde766fe54ea315a463b3':
Remove option to configure emergency app
Change-Id: Ia306455b8fe44d6e42493937fce6ad92904737fe
2016-05-25 00:23:28 +00:00
TreeHugger Robot
06b7d7cdf9
Merge "Remove option to configure emergency app" into nyc-dev
2016-05-25 00:17:20 +00:00
Andrew Sapperstein
dd8bc4a94f
Merge "Replace bluetooth pngs with vector drawables." into nyc-mr1-dev am: 759ba9d152
...
am: cd7376067c
* commit 'cd7376067cc8c10db13644e314a2fad5e1d1158b':
Replace bluetooth pngs with vector drawables.
Change-Id: I4abf91c3cf4fdb1e4d6867179992de9650683270
2016-05-25 00:16:49 +00:00
Andrew Sapperstein
cd7376067c
Merge "Replace bluetooth pngs with vector drawables." into nyc-mr1-dev
...
am: 759ba9d152
* commit '759ba9d152296470fa8d4153726cf8a08e4bf51d':
Replace bluetooth pngs with vector drawables.
Change-Id: I6c251e7207469ccbc6a147617aeed4af38138dcb
2016-05-25 00:09:08 +00:00
TreeHugger Robot
759ba9d152
Merge "Replace bluetooth pngs with vector drawables." into nyc-mr1-dev
2016-05-24 23:50:30 +00:00
Daniel Nishi
e9d8c8d58c
Change Downloads to show individual files in the Deletion Helper. am: 1370f7ed20
...
am: 5a546fbcaf
* commit '5a546fbcafded7e7244c2e7c2f95eb3f828c813e':
Change Downloads to show individual files in the Deletion Helper.
Change-Id: I974c1afee291448caf9656dabbae4f8637a3d17e
2016-05-24 23:11:22 +00:00
Daniel Nishi
5a546fbcaf
Change Downloads to show individual files in the Deletion Helper.
...
am: 1370f7ed20
* commit '1370f7ed200ae4442c1d4a159584c26bc86d8a63':
Change Downloads to show individual files in the Deletion Helper.
Change-Id: I52237038b49acdd1122c4ade19e408463027b0bb
2016-05-24 23:05:11 +00:00
Andrew Sapperstein
aeed7d481c
Replace bluetooth pngs with vector drawables.
...
The current pngs are hardcoded to the green accent color.
Instead, the new vector drawable replacements have colorAccent
set as a tint.
BUG: 28760785
Change-Id: I01853d4e93bca6651460ad86505d0943dc68bf93
2016-05-24 15:32:12 -07:00
Daniel Nishi
9243dffe47
Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev am: 97ac5c773d
...
am: ce584ff754
* commit 'ce584ff754f8fa2212a2f6a8855a3b7e3ce24dea':
Update the storage manager settings to match the mocks.
Change-Id: I8209c79d73db5259e5f7f9ef4a6ed01dfe14367c
2016-05-24 21:37:24 +00:00
Andrew Sapperstein
d668cb2c07
Merge "Refactor Settings theme colors." into nyc-mr1-dev am: 076731b825
...
am: 38972c3809
* commit '38972c38096a60464ee58cb7e63232bdacf43322':
Refactor Settings theme colors.
Change-Id: I7a56e486b2601d34a6cd9f8ab9adcfe2dcfb0f38
2016-05-24 21:37:19 +00:00
Daniel Nishi
ce584ff754
Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev
...
am: 97ac5c773d
* commit '97ac5c773da07d637ef0e92edbde4052714683ab':
Update the storage manager settings to match the mocks.
Change-Id: I9c6ed838d3f58fb97c93779c9378f59bb88b1b66
2016-05-24 21:32:37 +00:00
Daniel Nishi
1370f7ed20
Change Downloads to show individual files in the Deletion Helper.
...
The first implementation simply had every file in the Downloads folder
be under a single checkbox. This iteration makes Downloads an
expandable dropdown preference listing every single file individually
for selection to be deleted.
Bug: 28621781
Change-Id: I5169caf718cee4c0fa7f0248bc4c443984766005
2016-05-24 14:26:38 -07:00
Andrew Sapperstein
38972c3809
Merge "Refactor Settings theme colors." into nyc-mr1-dev
...
am: 076731b825
* commit '076731b8258bb9ed40cfef55c77c69f71fc86331':
Refactor Settings theme colors.
Change-Id: I520678bf558b33476b705fb7d48a54ecd9b1b5fc
2016-05-24 21:25:50 +00:00
Daniel Nishi
97ac5c773d
Merge "Update the storage manager settings to match the mocks." into nyc-mr1-dev
2016-05-24 21:18:39 +00:00
TreeHugger Robot
076731b825
Merge "Refactor Settings theme colors." into nyc-mr1-dev
2016-05-24 21:13:24 +00:00
Andrew Sapperstein
8dd11327b6
Refactor Settings theme colors.
...
Introduces stock colors (primary_color, primary_dark_color, etc) to allow
overriding the colors via resource overlays.
Creates new colorSecondary attribute and updates switches to use theme
attributes for foreground/background colors rather than hardcoded values.
Some other mild color cleanup to make things more straightforward.
BUG: 28760785
Change-Id: I4deba962357217bdb2e08c08e8f83b9b57a683d4
2016-05-24 12:49:17 -07:00
Daniel Nishi
974a6a6b71
Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev am: c05c8617bc
...
am: 11b6563cb6
* commit '11b6563cb635c1ca800923df7826f07eb13bf321':
Fix a crash where the deletion helper crashes when app sizes load.
Change-Id: Id0643922fe54ee3bbd5a931b256cac2a31e9a912
2016-05-24 15:50:51 +00:00
Daniel Nishi
11b6563cb6
Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev
...
am: c05c8617bc
* commit 'c05c8617bc1cb292b67b8c8d40723846914c20fc':
Fix a crash where the deletion helper crashes when app sizes load.
Change-Id: I0f32008388d8f462df95d1655f43869031be0c20
2016-05-24 15:45:58 +00:00
Daniel Nishi
c05c8617bc
Merge "Fix a crash where the deletion helper crashes when app sizes load." into nyc-mr1-dev
2016-05-24 15:36:22 +00:00
Victor Chang
53c30d2fd1
Merge "Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862
am: 8a85828424" into nyc-mr1-dev-plus-aosp
...
am: f1cbf0a3f2
* commit 'f1cbf0a3f267bf61ce15cd3272db987ff01e71ac':
Change-Id: I94f2784ab4ce93a01f9a16ed9873cb6974f6ffac
2016-05-24 14:43:47 +00:00
Victor Chang
dd467e01c2
Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862
am: 8cc4630521
...
am: 19a1107089
* commit '19a110708959b7b35e0d182e543f81e495de140b':
Trust the certificate after unlocking screenlock
Change-Id: I8b7090350236af52cdb345466a141c81e5af1d0b
2016-05-24 14:43:41 +00:00
Android Build Merger (Role)
f1cbf0a3f2
Merge "Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862
am: 8a85828424" into nyc-mr1-dev-plus-aosp
2016-05-24 14:24:22 +00:00
Victor Chang
0c9117a546
Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862
...
am: 8a85828424
* commit '8a858284242d428e9db69d337a717a48edc88714':
Trust the certificate after unlocking screenlock
Change-Id: I6ec7b8cc19605ede281c8ed1f80e7647a0edea51
2016-05-24 14:24:14 +00:00
Victor Chang
19a1107089
Merge "Trust the certificate after unlocking screenlock" into nyc-dev am: 32e17d0862
...
am: 8cc4630521
* commit '8cc4630521d649146087fc898c65446064305626':
Trust the certificate after unlocking screenlock
Change-Id: I120f9d1fac3742af4c1467c68b1fc34c2ffc54f3
2016-05-24 14:24:13 +00:00
Victor Chang
8cc4630521
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
...
am: 32e17d0862
* commit '32e17d08629e745cb21ba381f752ec84d2ed591e':
Trust the certificate after unlocking screenlock
Change-Id: Id0f6da39fc3af71a85ebde93f854d2752c7422b5
2016-05-24 14:20:02 +00:00
Victor Chang
8a85828424
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
...
am: 32e17d0862
* commit '32e17d08629e745cb21ba381f752ec84d2ed591e':
Trust the certificate after unlocking screenlock
Change-Id: Ib9e51ab5dac5d0f9a7e938a056cd99a0af4c22de
2016-05-24 14:20:01 +00:00
Victor Chang
32e17d0862
Merge "Trust the certificate after unlocking screenlock" into nyc-dev
2016-05-24 14:03:29 +00:00
Mahaver Chopra
2d15f81ee8
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev am: e6e8c92134
...
am: 150dd9cc4f
* commit '150dd9cc4fecbfd58db2f9e994077b9968368a2b':
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Change-Id: I386ad26655446801d1b6a221cdb8c6446b5a6ba9
2016-05-24 12:38:04 +00:00
Mahaver Chopra
150dd9cc4f
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
...
am: e6e8c92134
* commit 'e6e8c92134b7a212058d7728007407eb74720625':
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Change-Id: I2389a5518a55fc3131a91fb5a5d8af376d79d936
2016-05-24 12:31:57 +00:00
Mahaver Chopra
e6e8c92134
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
2016-05-24 12:23:20 +00:00
Mahaver Chopra
dcf3d7c185
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
...
Bug: 28339424
Change-Id: I2ccba997fc6c9ccfab802c0f49a9e2115a314552
2016-05-24 12:04:49 +00:00
Maurice Lam
ce16ccb792
Merge "Update margins to match specs" into nyc-mr1-dev am: 3b15d6234d
...
am: 534d856458
* commit '534d85645849a84b122d8a2d1ec7b7bf413ad956':
Update margins to match specs
Change-Id: Ie74c5f7feeb87a59af630d848ffe3e3d3cfb703e
2016-05-24 01:02:07 +00:00
Maurice Lam
534d856458
Merge "Update margins to match specs" into nyc-mr1-dev
...
am: 3b15d6234d
* commit '3b15d6234dc9097869030c1e5e2b26a9b34d1f19':
Update margins to match specs
Change-Id: Iceacbab85dd0697708ddfad1b95b9faccae11a2d
2016-05-24 00:54:11 +00:00
Maurice Lam
3b15d6234d
Merge "Update margins to match specs" into nyc-mr1-dev
2016-05-24 00:45:15 +00:00
Maurice Lam
b357e4a81a
Update margins to match specs
...
- Update settings to use GLIF versions for margins and styles
- Removed learn more link from AOSP Fingerprint intro screen because
it won't have a link to show.
Bug: 28885476
Change-Id: I5d2fd730a1bca2c5da8626da066da3a3f03b4428
2016-05-23 14:51:22 -07:00
Daniel Nishi
435628ac21
Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev am: 64b25588b7
...
am: f16b8be7b4
* commit 'f16b8be7b4c9d9da62ffd60d9c181c2e014c1edd':
Materialize the button bar in the Deletion Helper.
Change-Id: Ifa7291619131002f85288c7da63b70c947125d6d
2016-05-23 20:40:40 +00:00
Daniel Nishi
f16b8be7b4
Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev
...
am: 64b25588b7
* commit '64b25588b7aa1f377ffb1585c1a9f07c1705b7f0':
Materialize the button bar in the Deletion Helper.
Change-Id: Iece17635fc4c7a0ffd112381068b39a84bc3daeb
2016-05-23 20:28:56 +00:00
Daniel Nishi
ba03d2ff21
Update the storage manager settings to match the mocks.
...
Bug: 28560570
Change-Id: I0f218da1d23b687e38c52b5a927f7b84645958c7
2016-05-23 13:27:30 -07:00
Daniel Nishi
64b25588b7
Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev
2016-05-23 20:23:47 +00:00