Fan Zhang
aa21c1b07a
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
...
am: 00b127b134
* commit '00b127b134ff41ea14ec56fdd33c076e1ccffc1c':
Bring escalation options UI closer to mock.
Change-Id: I4e97594c7ea9d5c70f0629fae2c0f894a3fbab08
2016-05-04 18:03:42 +00:00
Jeff Sharkey
6bb1f8146b
Merge "UX polish tweaks to FallbackHome." into nyc-dev am: e50853f485
...
am: 0d613ab2cf
* commit '0d613ab2cf31d9a6608e5cf4b7e0f5e82ae89969':
UX polish tweaks to FallbackHome.
Change-Id: Ib6ef02d4a2f073b12b4079af82569489585fab93
2016-05-04 18:00:35 +00:00
Fan Zhang
00b127b134
Merge "Bring escalation options UI closer to mock." into nyc-mr1-dev
2016-05-04 17:47:17 +00:00
Jeff Sharkey
6c2fccfabf
Merge "UX polish tweaks to FallbackHome." into nyc-dev
...
am: e50853f485
* commit 'e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I392867952c277fea71ab86389ed6df1e5e483b20
2016-05-04 17:34:56 +00:00
Jeff Sharkey
0d613ab2cf
Merge "UX polish tweaks to FallbackHome." into nyc-dev
...
am: e50853f485
* commit 'e50853f485fd99c14d6af8167b06fc0c5ae19a22':
UX polish tweaks to FallbackHome.
Change-Id: I9fc3f4df1333e6e17bb7aa809f2a8a822697b616
2016-05-04 17:34:55 +00:00
TreeHugger Robot
e50853f485
Merge "UX polish tweaks to FallbackHome." into nyc-dev
2016-05-04 17:13:16 +00:00
Fan Zhang
cd09151224
Bring escalation options UI closer to mock.
...
Bug: 28141203
Change-Id: Ia6d50d7d6f3010695c62fc1e8bd07f858715e455
2016-05-04 08:58:00 -07:00
Tony Mak
2211926ac4
resolve merge conflicts of d5b3a5d
to nyc-mr1-dev
...
am: 8f14564787
* commit '8f14564787da3705a895e945c72c890604d13cfd':
Add managed profile setting page
Change-Id: If1f79ebf4127aac5d8eb7b5ce74c32e3ad145121
2016-05-04 10:40:57 +00:00
Tony Mak
8f14564787
resolve merge conflicts of d5b3a5d
to nyc-mr1-dev
...
Change-Id: I1eb01bfdad24935efbbdbeaee0dcf1c374a2cadb
2016-05-04 11:14:48 +01:00
Tony Mak
b8cfa32bf1
Merge "Add managed profile setting page" into nyc-dev
...
am: d5b3a5d342
* commit 'd5b3a5d342d74411b0e4466541d5c5b1168eb803':
Add managed profile setting page
Change-Id: I1ca66552fe44e7ace9ff7b314ab0f7af53ca1e6c
2016-05-04 09:41:58 +00:00
Tony Mak
d5b3a5d342
Merge "Add managed profile setting page" into nyc-dev
2016-05-04 09:33:24 +00:00
Baligh Uddin
61e99fed5b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 28463229
Change-Id: I7f6bb467fe967635f9febafb61764b596d075fa3
2016-05-03 17:00:33 -07:00
Jeff Sharkey
c80dc5e5ef
UX polish tweaks to FallbackHome.
...
When showing during first boot (before provisioned), render as
completely black to avoid wallpaper jank before showing SUW. Also
tweak theme used during normal (provisioned) launches to avoid
rendering the dim layer behind status bar.
Bug: 28530777
Change-Id: I4b9e6c54583f07c78d86fbe9bda7f24b6959f4ba
2016-05-03 17:25:40 -06:00
Michael Wright
8a2d933b58
Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b
...
am: df824969af
* commit 'df824969af786598f951830bd6ec387606da316a':
Add subtext for default keyboard layout.
Change-Id: I3f2802ca95c8c0b95967dd52fdc664544f6eeccf
2016-05-03 18:36:48 +00:00
Michael Wright
df824969af
Merge "Add subtext for default keyboard layout." into nyc-dev
...
am: 12c2c2538b
* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
Add subtext for default keyboard layout.
Change-Id: Idd3946011f5f516c444973ce0f06381efe44cda9
2016-05-03 18:34:18 +00:00
Michael Wright
e71a6ac6cd
Merge "Add subtext for default keyboard layout." into nyc-dev
...
am: 12c2c2538b
* commit '12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
Add subtext for default keyboard layout.
Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282
2016-05-03 18:34:17 +00:00
Michael Wright
12c2c2538b
Merge "Add subtext for default keyboard layout." into nyc-dev
2016-05-03 18:28:59 +00:00
Michael Wright
276cc4d8ed
Add subtext for default keyboard layout.
...
Bug: 27742933
Change-Id: I51bec339c0cbcfb114f85758b6a227deb57a69e2
2016-05-03 18:27:16 +00:00
Tony Mak
64f6d9896f
Add managed profile setting page
...
Bug: 28281560
Change-Id: I1187f834dd9d002ec898a7d343198025963d1c26
2016-05-03 18:55:41 +01:00
Baligh Uddin
0737787235
Import translations. DO NOT MERGE
...
Change-Id: Ief7fdf92fd579e99764edbf2438caa44d6735da7
Auto-generated-cl: translation import
2016-05-03 01:39:46 -07:00
Baligh Uddin
e118a96fd0
Import translations. DO NOT MERGE
...
Change-Id: If49388814aafcf05ad9b1899b7e991463c8c3662
Auto-generated-cl: translation import
2016-05-03 01:25:52 -07:00
Clara Bayarri
2e8d2fabfc
Merge "Remove Secure Startup option from Security Settings" into nyc-dev am: 35bf932eb0
...
am: 1159a0a79c
* commit '1159a0a79cdf9fcbbae574198ae5ba192ef84aca':
Remove Secure Startup option from Security Settings
Change-Id: I2721e0e9e2d5920e54b549124664a303a591ae54
2016-04-29 17:41:14 +00:00
Clara Bayarri
99e5285425
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
...
am: 35bf932eb0
* commit '35bf932eb0daf8038cc917508839784953c45c72':
Remove Secure Startup option from Security Settings
Change-Id: Ife90c8effce61106a438ccd9158a001792810ede
2016-04-29 17:39:05 +00:00
Clara Bayarri
1159a0a79c
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
...
am: 35bf932eb0
* commit '35bf932eb0daf8038cc917508839784953c45c72':
Remove Secure Startup option from Security Settings
Change-Id: Id555f9a2abadf9a941e5e63e60ea55c5ce7179bd
2016-04-29 17:38:56 +00:00
Clara Bayarri
35bf932eb0
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
2016-04-29 17:28:42 +00:00
Fan Zhang
e00703242b
Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev
...
am: 050d94151f
* commit '050d94151fa931ee2c90a1c949090f66aa032792':
Prompt sign-in when there is no account for support options
Change-Id: I6b78faaf8080a5c0e6c4158592c297e1d9728039
2016-04-29 15:56:25 +00:00
Fan Zhang
050d94151f
Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev
2016-04-29 15:49:30 +00:00
Shweta Chahar
6105121d8c
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am: 19c01f0351
...
am: bf4e0306bc
* commit 'bf4e0306bc9acf8fcb00df87e8f03755f0c06c7a':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java
Change-Id: I77472d9ba0ddce30a5e99d9b65725312521d85ec
2016-04-29 13:36:43 +00:00
shwetachahar
bf4e0306bc
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
...
am: 19c01f0351
* commit '19c01f03511610541ab80b8f565381da31d21926':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java
Change-Id: I0b55dd38a001726331012df441de34ba998c512f
2016-04-29 13:34:19 +00:00
shwetachahar
5d8a18ce2a
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
...
am: 19c01f0351
* commit '19c01f03511610541ab80b8f565381da31d21926':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java
Change-Id: If4a777002972d217fbd770c0b2f481a9934bfd41
2016-04-29 13:34:19 +00:00
Shweta Chahar
19c01f0351
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
2016-04-29 13:29:10 +00:00
Philip P. Moltmann
5fd8e1b03c
Handling of issues while migrating primary storage am: 1ec941db0c
...
am: 16d64842d9
* commit '16d64842d9b4e54f3e99a760e60918ac4f16bddf':
Handling of issues while migrating primary storage
Change-Id: I0c817a826c44e42ab169423eac9500c92650fb7e
2016-04-28 23:24:06 +00:00
Philip P. Moltmann
16d64842d9
Handling of issues while migrating primary storage
...
am: 1ec941db0c
* commit '1ec941db0ce37a864b5aa1a92111e5c52953c33e':
Handling of issues while migrating primary storage
Change-Id: Ic298e031e2b8b2afcfce5a4f01b34f6c7dd13b65
2016-04-28 23:21:50 +00:00
Philip P. Moltmann
4d2714fd10
Handling of issues while migrating primary storage
...
am: 1ec941db0c
* commit '1ec941db0ce37a864b5aa1a92111e5c52953c33e':
Handling of issues while migrating primary storage
Change-Id: I95283e6b84be28c026867b47ce84a1425e8b3859
2016-04-28 23:21:48 +00:00
Philip P. Moltmann
1ec941db0c
Handling of issues while migrating primary storage
...
Bug: 28177789
Change-Id: Icfbd048ddf0a1d55df1e7273d49727357b98a452
2016-04-28 14:44:53 -07:00
Fan Zhang
a6c862caf6
Prompt sign-in when there is no account for support options
...
Bug: 28141203
Bug: 28316343
Change-Id: Ie7f86955519504e5eed4af4c8406a353a3847995
2016-04-28 14:40:07 -07:00
Julia Reynolds
c4fd2aa83e
Expand BT screen. am: 05c6a2c007
...
am: 8136b125f6
* commit '8136b125f66ae32f1ab64b74a225d583fb911c60':
Expand BT screen.
Change-Id: I882414db3110576b33ef9c3d102c074880a79e93
2016-04-28 19:37:17 +00:00
Julia Reynolds
8136b125f6
Expand BT screen.
...
am: 05c6a2c007
* commit '05c6a2c007675fede50245519571879f749c8e66':
Expand BT screen.
Change-Id: I0c3ed43962f1618b4cffe054bcff1fff0b5e0893
2016-04-28 19:35:28 +00:00
Julia Reynolds
8acb204098
Expand BT screen.
...
am: 05c6a2c007
* commit '05c6a2c007675fede50245519571879f749c8e66':
Expand BT screen.
Change-Id: Ied5dfb76787680a4b48f62dedd657fb065f744fd
2016-04-28 19:24:51 +00:00
Julia Reynolds
05c6a2c007
Expand BT screen.
...
Bug: 27106877
Change-Id: I31100598f27d45b6a50351f14bd0d20cc6e27d9d
2016-04-28 14:27:02 -04:00
shwetachahar
7c0bc8ed76
Set the max for pitch seekbar in xml in sync with the max for pitch
...
seekbar in TextToSpeechSettings.java
Bug: 28257828
Change-Id: I8a114cf31d72eedf1ba03093364074bec7e7cdee
2016-04-28 16:09:18 +01:00
Wei Wang
d780b1b4e1
Merge "Add an entry in developer options for location tools." into nyc-dev am: 920cf0a
...
am: aee68e0
* commit 'aee68e029a37e7a18d8086e27ae1bf1bc6c33da1':
Add an entry in developer options for location tools.
Change-Id: I97963a037f35ca3dd0db22ed5d6ff086acb5f912
2016-04-28 06:06:14 +00:00
Wei Wang
ec8b526fd0
Merge "Add an entry in developer options for location tools." into nyc-dev
...
am: 920cf0a
* commit '920cf0a7b3ae75c6844bcb7994fd36d3e7968506':
Add an entry in developer options for location tools.
Change-Id: I5af67764994e4cfed9f8ef4243954260d48ae163
2016-04-28 06:03:17 +00:00
Wei Wang
aee68e029a
Merge "Add an entry in developer options for location tools." into nyc-dev
...
am: 920cf0a
* commit '920cf0a7b3ae75c6844bcb7994fd36d3e7968506':
Add an entry in developer options for location tools.
Change-Id: Ie48ad7a27367353e50d0dc021c2f36eebf04af77
2016-04-28 06:03:16 +00:00
Wei Wang
920cf0a7b3
Merge "Add an entry in developer options for location tools." into nyc-dev
2016-04-28 05:57:30 +00:00
Wei Wang
e1c1a13cba
Add an entry in developer options for location tools.
...
This is a temporary place holder for location dogfood tools, which will
be removed before ship.
Bug:28383982
Change-Id: I814c9a71044c2f73a6346bdd46ecd40375c984b8
2016-04-27 15:51:19 -07:00
Fan Zhang
8d52417257
Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev
...
am: cd89d12
* commit 'cd89d1264227fccd9fe72acc78d959ff17196f69':
Monitor connectivity change and display offline promo.
Change-Id: I72ce587dba5ffb9e821658e10415a5d5ffad7e5d
2016-04-27 21:01:00 +00:00
Fan Zhang
cd89d12642
Merge "Monitor connectivity change and display offline promo." into nyc-mr1-dev
2016-04-27 20:42:38 +00:00
Bill Yi
88e71ef151
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-04-27 19:44:32 +00:00
Bill Yi
eb50d20504
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-04-27 19:44:13 +00:00