Fan Zhang
6485952e26
Merge \"Display operation hours when support is closed.\" into nyc-mr1-dev
...
am: c3a0a18f77
2016-06-23 17:38:23 +00:00
Fan Zhang
c3a0a18f77
Merge "Display operation hours when support is closed." into nyc-mr1-dev
2016-06-23 17:27:11 +00:00
Steven Ng
0998abfc8f
Update the OEM unlock preference summary to reflect the disable reason
...
3 cases implemented:
1) Bootloader unlocked
2) Device SIM-locked
3) Device Configuration, such as SIM-lock, has not been retrieved.
Bug: 29047618
Change-Id: Idf5cc1c9b1d105a0efd408cc2aa0e229e874442e
2016-06-23 10:21:05 +01:00
Daniel Nishi
53bbada296
Re-add a string to fix a build breakage. am: be42f8bb61
...
am: e91548ab38
2016-06-23 01:51:32 +00:00
Daniel Nishi
e91548ab38
Re-add a string to fix a build breakage.
...
am: be42f8bb61
2016-06-23 01:48:55 +00:00
Daniel Nishi
be42f8bb61
Re-add a string to fix a build breakage.
...
Change-Id: I079a5643634ffbf68f9414c639a9aba4a8a67d75
2016-06-22 18:41:04 -07:00
Daniel Nishi
b4a6067d66
Merge \\"Remove the Deletion Helper and Automatic Storage Management jobs.\\" into nyc-mr1-dev am: de17410d37
...
am: 4938a9a470
2016-06-23 00:05:43 +00:00
Daniel Nishi
4938a9a470
Merge \"Remove the Deletion Helper and Automatic Storage Management jobs.\" into nyc-mr1-dev
...
am: de17410d37
2016-06-22 23:59:02 +00:00
Daniel Nishi
de17410d37
Merge "Remove the Deletion Helper and Automatic Storage Management jobs." into nyc-mr1-dev
2016-06-22 23:52:23 +00:00
Nathan Harold
177f93eefb
Merge \\"Add Debug Toggles for Video and WiFI Calling Provisioning\\" into nyc-mr1-dev am: d63c3e7854
...
am: 078f579871
2016-06-22 23:29:21 +00:00
Nathan Harold
078f579871
Merge \"Add Debug Toggles for Video and WiFI Calling Provisioning\" into nyc-mr1-dev
...
am: d63c3e7854
2016-06-22 23:26:50 +00:00
Nathan Harold
d63c3e7854
Merge "Add Debug Toggles for Video and WiFI Calling Provisioning" into nyc-mr1-dev
2016-06-22 23:20:09 +00:00
Fan Zhang
0bc42ab618
Display operation hours when support is closed.
...
Bug: 29105266
Change-Id: Id451b1aa820961fad4ece07fde5782a5aecaee68
2016-06-22 09:26:49 -07:00
Andrew Sapperstein
084322e4ee
Merge \\"Update Settings to use DeviceDefault.Settings.\\" into nyc-mr1-dev am: 70ff5f8fa1
...
am: 61c34c0556
2016-06-22 00:55:25 +00:00
Andrew Sapperstein
61c34c0556
Merge \"Update Settings to use DeviceDefault.Settings.\" into nyc-mr1-dev
...
am: 70ff5f8fa1
2016-06-21 23:49:59 +00:00
Andrew Sapperstein
70ff5f8fa1
Merge "Update Settings to use DeviceDefault.Settings." into nyc-mr1-dev
2016-06-21 23:02:13 +00:00
Doris Ling
2d1def707f
Merge \\"Add play icon to the gesture settings videos.\\" into nyc-mr1-dev am: 9ca0e6cc86
...
am: bdbd9e43d1
2016-06-21 19:07:11 +00:00
Doris Ling
bdbd9e43d1
Merge \"Add play icon to the gesture settings videos.\" into nyc-mr1-dev
...
am: 9ca0e6cc86
2016-06-21 19:04:29 +00:00
Doris Ling
9ca0e6cc86
Merge "Add play icon to the gesture settings videos." into nyc-mr1-dev
2016-06-21 18:55:54 +00:00
Andrew Sapperstein
e300b0fc1c
Use colorSecondary for switch bar backgrounds.
...
Delete the private version in favor of using the platform's.
BUG: 28625050
Change-Id: I6bf0a13e5018f48f32a26a38307c30cf1aee0619
2016-06-21 11:50:20 -07:00
Andrew Sapperstein
5b66e143cc
Update Settings to use DeviceDefault.Settings.
...
BUG: 28625050
Change-Id: Id283703a309cf27bb284147421614196e903c660
2016-06-21 11:23:39 -07:00
Fan Zhang
3b50d91ee9
Merge \\"Enable/disable support buttons based on operation hours.\\" into nyc-mr1-dev am: a00e3b78de
...
am: e4d1e73c87
2016-06-21 17:31:23 +00:00
Fan Zhang
e4d1e73c87
Merge \"Enable/disable support buttons based on operation hours.\" into nyc-mr1-dev
...
am: a00e3b78de
2016-06-21 17:27:31 +00:00
Fan Zhang
a00e3b78de
Merge "Enable/disable support buttons based on operation hours." into nyc-mr1-dev
2016-06-21 17:21:07 +00:00
Daniel Nishi
aad643caf2
Remove the Deletion Helper and Automatic Storage Management jobs.
...
The automatic storage management settings have been left in place
and updated to use the intent to get into the deletion helper.
Bug: 28965462
Change-Id: I736c8e741b519eceb89075b74d42b38c3aa5d0f4
2016-06-21 10:00:52 -07:00
TreeHugger Robot
5903be35f4
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-21 16:53:39 +00:00
TreeHugger Robot
f11d06991a
Merge "Import translations. DO NOT MERGE"
2016-06-21 16:53:16 +00:00
Sunny Goyal
bcfe8e8d95
Merge \\"Adding custom manifest shortcuts in Settings app\\" into nyc-mr1-dev am: 139fbb78b5
...
am: 6f38bd7620
2016-06-21 16:51:23 +00:00
Sunny Goyal
6f38bd7620
Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev
...
am: 139fbb78b5
2016-06-21 16:48:12 +00:00
Bill Yi
efd819e862
Import translations. DO NOT MERGE
...
Change-Id: Ia258f44583c5690bd396d20517e1309807c659ad
Auto-generated-cl: translation import
2016-06-21 04:40:02 -07:00
Bill Yi
c1db3d0c31
Import translations. DO NOT MERGE
...
Change-Id: I329f068208298bdb3cfdd4370e33cd9e2886298c
Auto-generated-cl: translation import
2016-06-21 03:52:26 -07:00
Sunny Goyal
5f179fcef1
Adding custom manifest shortcuts in Settings app
...
Bug:28298258
Change-Id: Ie7fd86a999fa2abe2522adfb29573b86f36db3a5
2016-06-20 16:44:17 -07:00
Fan Zhang
841b13ac98
Enable/disable support buttons based on operation hours.
...
Also update support title based on whether support operation is
available.
Bug: 28827790
Change-Id: I65eb70d18ba16ccc263bce019fcbbe5e10ffa596
2016-06-20 11:18:51 -07:00
Jason Monk
0ceacec553
Fix focusability of battery history chart am: 9c6ab88bd7 am: b363eb89bc
...
am: b6af413f8b
2016-06-20 17:57:05 +00:00
Jason Monk
b6af413f8b
Fix focusability of battery history chart am: 9c6ab88bd7
...
am: b363eb89bc
2016-06-20 17:38:19 +00:00
Fan Zhang
a659b1110a
Merge \\"Add a \\"Do not show\\" checkbox in support disclaimer dialog.\\" into nyc-mr1-dev am: d04b49649e
...
am: 461b286de7
2016-06-20 17:36:22 +00:00
Jason Monk
b363eb89bc
Fix focusability of battery history chart
...
am: 9c6ab88bd7
2016-06-20 17:29:24 +00:00
Fan Zhang
461b286de7
Merge \"Add a \"Do not show\" checkbox in support disclaimer dialog.\" into nyc-mr1-dev
...
am: d04b49649e
2016-06-20 17:25:45 +00:00
Fan Zhang
d04b49649e
Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev
2016-06-20 16:35:52 +00:00
Jason Monk
9c6ab88bd7
Fix focusability of battery history chart
...
Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes: 29453492
2016-06-20 11:04:43 -04:00
Nathan Harold
12e1f55e92
Add Debug Toggles for Video and WiFI Calling Provisioning
...
-Add a debug toggle for Video Calling Provisioning
-Add a debug toggle for WiFi Calling Provisioning
Change-Id: I0cf3861ceabda48295181347b8997a2c8212de27
2016-06-17 19:09:33 -07:00
Doris Ling
f5cecb08fb
Add play icon to the gesture settings videos.
...
1. Add a play button icon to show on top of the gesture videos when the
video is not playing.
2. Dynamically split the gesture video and description text in half
instead of using the hard coded value.
3. Hide the video view if animation is not available.
4. Delay removing the animation preview till the video starts drawing on
the surface texture.
Bug: 28565958
Change-Id: I8b954828d16286014404172d29efa4d2e00432b3
2016-06-17 17:53:35 -07:00
Fan Zhang
0beb695999
Add a "Do not show" checkbox in support disclaimer dialog.
...
Bug: 28762823
Change-Id: I8fe0a82efbb47c8b2f9e34480005fa108583b203
2016-06-17 12:56:35 -07:00
Adrian Roos
6f23c0493a
resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
...
am: fa2bbcc288
2016-06-17 18:55:31 +00:00
Maurice Lam
306cec109d
Center pattern lock screen vertically am: 0707fdc2e0
...
am: 00a6fd6df2
2016-06-17 18:54:52 +00:00
Maurice Lam
f438a1a423
Merge \\"Use GLIF theme for Settings > Security > Screen lock\\" into nyc-mr1-dev am: 223d45ea0e
...
am: 47e38646ed
2016-06-17 18:54:51 +00:00
Adrian Roos
fa2bbcc288
resolve merge conflicts of 380b01a to nyc-mr1-dev-plus-aosp
...
Change-Id: If97f5d5b4d67177b8160b96894a35d685573c46a
2016-06-16 18:58:04 -07:00
Adrian Roos
bd470255d0
resolve merge conflicts of 333ba2d to nyc-mr1-dev
...
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
2016-06-16 18:54:50 -07:00
Maurice Lam
00a6fd6df2
Center pattern lock screen vertically
...
am: 0707fdc2e0
2016-06-17 01:45:44 +00:00
Adrian Roos
380b01a00e
Merge \"Remove RemoteInput on lockscreen setting\" into nyc-dev
...
am: 333ba2df01
2016-06-16 23:41:25 +00:00
