Fyodor Kupolov
cc1379bfea
Merge "Lockdown settings in retail demo mode" into nyc-mr1-dev
2016-06-28 23:08:46 +00:00
Fan Zhang
0f38866528
Merge changes from topics \'offline_operation_hours_part5\', \'offline_operation_hours_part4\' into nyc-mr1-dev
...
am: 734c550c59
2016-06-28 19:28:11 +00:00
TreeHugger Robot
734c550c59
Merge changes from topics 'offline_operation_hours_part5', 'offline_operation_hours_part4' into nyc-mr1-dev
...
* changes:
Show a static title/summary if country doesn't have support
By default select current country in support phone list.
2016-06-28 19:20:03 +00:00
Doris Ling
5d1a512934
Update listener for animation in Gesture Settings.
...
Use onClick listener instead of onTouch listener for handling playback
for the animation video.
Bug: 29779942
Change-Id: Ia30c0c49635fedd7f5afd4873ed1971529b99dcc
2016-06-28 11:55:20 -07:00
Fan Zhang
2768793840
Merge \"Show operation hours for selected country\'s support phone\" into nyc-mr1-dev
...
am: ab7a6cf828
2016-06-28 18:13:20 +00:00
Fan Zhang
45eb3c04b5
Merge \"Show tolled support number when click travel abroad.\" into nyc-mr1-dev
...
am: 106ff4ff0c
2016-06-28 18:13:19 +00:00
Fan Zhang
ab7a6cf828
Merge "Show operation hours for selected country's support phone" into nyc-mr1-dev
2016-06-28 18:10:32 +00:00
Fan Zhang
106ff4ff0c
Merge "Show tolled support number when click travel abroad." into nyc-mr1-dev
2016-06-28 18:07:52 +00:00
Doris Ling
007f83964c
Merge \"Update UI for Storage settings.\" into nyc-mr1-dev
...
am: d65b27a02c
2016-06-28 17:12:34 +00:00
Doris Ling
d65b27a02c
Merge "Update UI for Storage settings." into nyc-mr1-dev
2016-06-28 17:08:09 +00:00
Fan Zhang
8f0a0ac8e7
UI Tweak: update setting dashboard cards background color.
...
Bug: 29397123
Change-Id: Ie503fa6ae390db3c9e651d8b95e5c86f29bca46c
2016-06-28 08:32:31 -07:00
Fan Zhang
973d6d57f0
Merge \"Restore selected country when rotating screen.\" into nyc-mr1-dev
...
am: 53f5539b6b
2016-06-28 15:17:23 +00:00
Fan Zhang
53f5539b6b
Merge "Restore selected country when rotating screen." into nyc-mr1-dev
2016-06-28 15:12:16 +00:00
Ricky Wai
fe1cb3ca19
Merge \"Set message id in notification redaction activity\" into nyc-mr1-dev
...
am: a02e5f73ca
2016-06-28 10:42:07 +00:00
Ricky Wai
6bd1003050
Merge \"Refresh screenlock UI after password verification failed\" into nyc-mr1-dev
...
am: 93071a4bc3
2016-06-28 10:42:06 +00:00
Ricky Wai
a02e5f73ca
Merge "Set message id in notification redaction activity" into nyc-mr1-dev
2016-06-28 10:36:43 +00:00
Ricky Wai
93071a4bc3
Merge "Refresh screenlock UI after password verification failed" into nyc-mr1-dev
2016-06-28 10:36:19 +00:00
Fan Zhang
2c9f35e98d
Show a static title/summary if country doesn't have support
...
Bug: 29105266
Change-Id: I874fbb1172ab2faf9372362cf0e1f933046c621c
2016-06-27 17:38:03 -07:00
Fan Zhang
46da9be509
By default select current country in support phone list.
...
Bug: 29105266
Change-Id: I78027e5c817aae5e2220bc974e03282d937c33c6
2016-06-27 17:37:58 -07:00
Fan Zhang
2736ace057
Show operation hours for selected country's support phone
...
Bug: 28827790
Change-Id: Idddaefa33cf1a128b70c517b1acb61a2b7bab288
2016-06-27 15:56:20 -07:00
Fan Zhang
3737fabda4
Show tolled support number when click travel abroad.
...
Bug: 29105266
Change-Id: I3020039bafe26e8a494075ad2f192dba07ab6dd0
2016-06-27 15:56:20 -07:00
Doris Ling
05af648142
Update UI for Storage settings.
...
Change the text color for the used storage number to colorAccent and increase the
height of the storage bar graph to match that in Memory settings.
Bug: 29417812
Change-Id: I2a2f6a3fb39c4c23e51a8be8e6feefa101d74797
2016-06-27 14:23:17 -07:00
Philip P. Moltmann
23176395a5
Setup up print settings fragments in onCreateView instead of onCreate.
...
Otherwise some of the layout is not yet set up.
Fixes: 29764546
Change-Id: Ia0716dd0603d66e8bf68494e426756bd553f1afd
2016-06-27 21:07:07 +00:00
Steven Ng
732418cc07
Merge \"Update the OEM unlock preference summary to reflect the disable reason\" into nyc-mr1-dev
...
am: dbb8cab438
2016-06-27 19:20:10 +00:00
Steven Ng
dbb8cab438
Merge "Update the OEM unlock preference summary to reflect the disable reason" into nyc-mr1-dev
2016-06-27 19:14:38 +00:00
Steven Ng
4e77176ca3
Merge \"Disable \"disable\" button for the device provision app in the Settings app\" into nyc-mr1-dev
...
am: 8aee45afb6
2016-06-27 18:57:18 +00:00
Steven Ng
8aee45afb6
Merge "Disable "disable" button for the device provision app in the Settings app" into nyc-mr1-dev
2016-06-27 18:50:02 +00:00
Android Build Merger (Role)
96169134bc
Merge "Merge \\"Fix DND conditional null state\\" into nyc-dev am: 733649c2fa am: d944277d1f" into nyc-mr1-dev-plus-aosp
2016-06-27 18:46:46 +00:00
Jason Monk
a7bb1b2f47
Merge \\"Fix DND conditional null state\\" into nyc-dev am: 733649c2fa
...
am: 77fc052dd7
2016-06-27 18:46:31 +00:00
Jason Monk
5490451292
Merge \\"Fix DND conditional null state\\" into nyc-dev am: 733649c2fa
...
am: d944277d1f
2016-06-27 18:46:30 +00:00
Jason Monk
d944277d1f
Merge \"Fix DND conditional null state\" into nyc-dev
...
am: 733649c2fa
2016-06-27 18:42:15 +00:00
Jason Monk
77fc052dd7
Merge \"Fix DND conditional null state\" into nyc-dev
...
am: 733649c2fa
2016-06-27 18:42:15 +00:00
Jason Monk
733649c2fa
Merge "Fix DND conditional null state" into nyc-dev
2016-06-27 18:36:21 +00:00
Bill Yi
82b84aa9dd
Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours
...
am: 98fd2d2a82
2016-06-27 18:09:39 +00:00
Bill Yi
98fd2d2a82
Import translations. DO NOT MERGE
...
am: 5a9f7d6c9a
2016-06-27 17:50:21 +00:00
Bill Yi
7bbd4c250d
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
...
am: ee32cd8cd6
2016-06-27 17:38:42 +00:00
Bill Yi
1417a5b268
Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours
...
am: 3040f703d7
2016-06-27 17:37:30 +00:00
Bill Yi
3040f703d7
Import translations. DO NOT MERGE
...
am: 5a9f7d6c9a
2016-06-27 17:33:19 +00:00
TreeHugger Robot
ee32cd8cd6
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-27 17:27:52 +00:00
Victor Chang
8dc82cb436
Merge \"Add explanatory text displayed when \'Always-on\' switch is greyed-out for VPN apps w/targetSdk<24\" into nyc-mr1-dev
...
am: 4ffd7552a3
2016-06-27 17:19:41 +00:00
Doris Ling
fe4481899e
Merge \"Update UI for the Gestures settings.\" into nyc-mr1-dev
...
am: 8661620b3a
2016-06-27 17:19:40 +00:00
Victor Chang
4ffd7552a3
Merge "Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24" into nyc-mr1-dev
2016-06-27 17:14:51 +00:00
Doris Ling
8661620b3a
Merge "Update UI for the Gestures settings." into nyc-mr1-dev
2016-06-27 17:08:30 +00:00
Victor Chang
52247f69a5
Add explanatory text displayed when 'Always-on' switch is greyed-out for VPN apps w/targetSdk<24
...
Bug: 28413917
Change-Id: I3e7c079b4f91c02e5d0c0e8fda4ac6775dd0247b
2016-06-27 18:07:35 +01:00
Fan Zhang
b0060dde63
Restore selected country when rotating screen.
...
Bug: 29105266
Change-Id: I5c070a40465b32b4989481f270c448ba48f0e865
2016-06-27 09:56:52 -07:00
Jason Monk
095d9e3d3f
Fix DND conditional null state
...
Persist all of the data it needs to produce the UI.
Change-Id: Ifb143b2cd3fef075cd77feaf53051eb8b7153a51
Fixes: 27664882
2016-06-27 12:29:47 -04:00
Fan Zhang
d2b3809cae
Merge \"When offline show a list of countries with phone support.\" into nyc-mr1-dev
...
am: e9fcb2c930
2016-06-27 15:48:27 +00:00
Fan Zhang
e9fcb2c930
Merge "When offline show a list of countries with phone support." into nyc-mr1-dev
2016-06-27 15:45:54 +00:00
Bill Yi
e016863c33
Import translations. DO NOT MERGE
...
Change-Id: I2d819a9b21bbfb288820594955e7b17be7c78e61
Auto-generated-cl: translation import
2016-06-27 07:43:13 -07:00
Bill Yi
5a9f7d6c9a
Import translations. DO NOT MERGE
...
Change-Id: If45fdc9e3e694f67b9aa78b230fc1491f39f0551
Auto-generated-cl: translation import
2016-06-27 07:34:32 -07:00
