Commit Graph

29564 Commits

Author SHA1 Message Date
Bill Yi
98921f0397 Import translations. DO NOT MERGE
Change-Id: I1431033a7186031c35440012198f592530d54c39
Auto-generated-cl: translation import
2016-06-29 17:55:51 -07:00
Fyodor Kupolov
5210fcc801 Merge \\"Lockdown settings in retail demo mode\\" into nyc-mr1-dev am: cc1379bfea
am: 6622af5d10

Change-Id: Iceb6723dc46305c19da98d8f542633e0c7c17f16
2016-06-28 23:18:06 +00:00
Fyodor Kupolov
6622af5d10 Merge \"Lockdown settings in retail demo mode\" into nyc-mr1-dev
am: cc1379bfea

Change-Id: I49c818af2a1f966c60f7ba184cf50fcfcae788ad
2016-06-28 23:14:39 +00:00
Fyodor Kupolov
cc1379bfea Merge "Lockdown settings in retail demo mode" into nyc-mr1-dev 2016-06-28 23:08:46 +00:00
Muyuan Li
5a48c8493f Only shows music stream when using master stream.
Bug: 29446492
Change-Id: I52b686daa21499d0b054f762251c544c263fdec4
(cherry picked from commit ec88e104befb872c0bde99871eec73bf5d705369)
2016-06-28 20:51:32 +00:00
Fan Zhang
f71366d8ef Merge changes from topics \\'offline_operation_hours_part5\\', \\'offline_operation_hours_part4\\' into nyc-mr1-dev am: 734c550c59
am: 0f38866528

Change-Id: Idbdaaf9ab08009e1250b4cf3649e46e8a8340087
2016-06-28 19:34:15 +00:00
Fan Zhang
0f38866528 Merge changes from topics \'offline_operation_hours_part5\', \'offline_operation_hours_part4\' into nyc-mr1-dev
am: 734c550c59

Change-Id: If9d9c8e960fd526e0d6d6df5189ae71de4802421
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
Fan Zhang
d85f11eb97 Merge \\"Show operation hours for selected country\\'s support phone\\" into nyc-mr1-dev am: ab7a6cf828
am: 2768793840

Change-Id: Ib73505b8dd88d725b61cc5d43cc1774ab8cc9694
2016-06-28 18:16:28 +00:00
Fan Zhang
fd82193e37 Merge \\"Show tolled support number when click travel abroad.\\" into nyc-mr1-dev am: 106ff4ff0c
am: 45eb3c04b5

Change-Id: I13303f7c82801212034dc2744adb009b6ce00e43
2016-06-28 18:16:26 +00:00
Fan Zhang
2768793840 Merge \"Show operation hours for selected country\'s support phone\" into nyc-mr1-dev
am: ab7a6cf828

Change-Id: I325c9dcb1469855d3273e42457ee0e0f3d62d8fa
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

Change-Id: I60c628afcc5d790a22a6baf9f90f9564f06d6b51
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
9dac14f9f4 Merge \\"Update UI for Storage settings.\\" into nyc-mr1-dev am: d65b27a02c
am: 007f83964c

Change-Id: I5b92608ccd6af6d2fccafdbe515ec424a108c4e9
2016-06-28 17:15:33 +00:00
Doris Ling
007f83964c Merge \"Update UI for Storage settings.\" into nyc-mr1-dev
am: d65b27a02c

Change-Id: I87a2a929604f6fda9f2805224fffebfddc15e44c
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
0d152844bc Merge \\"Restore selected country when rotating screen.\\" into nyc-mr1-dev am: 53f5539b6b
am: 973d6d57f0

Change-Id: I43cdffc6ba0bdddb5caf2c7ebcde39d68f5972ac
2016-06-28 15:20:09 +00:00
Fan Zhang
973d6d57f0 Merge \"Restore selected country when rotating screen.\" into nyc-mr1-dev
am: 53f5539b6b

Change-Id: Ie4e1578308005b2adae995f372dd0150529da781
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
Nicolas Prévot
7dc283b1d7 Merge "Don't dismiss remove work profile dialog on orientation change." 2016-06-28 11:15:55 +00:00
Ricky Wai
c070e5e039 Merge \\"Set message id in notification redaction activity\\" into nyc-mr1-dev am: a02e5f73ca
am: fe1cb3ca19

Change-Id: I95f5659dc91872faff8b1261f25233dc8b55e79a
2016-06-28 10:45:30 +00:00
Ricky Wai
0c40b37aa1 Merge \\"Refresh screenlock UI after password verification failed\\" into nyc-mr1-dev am: 93071a4bc3
am: 6bd1003050

Change-Id: Ibbbe57e789c2520b2e5e8ce109ea647de3602134
2016-06-28 10:45:29 +00:00
Ricky Wai
fe1cb3ca19 Merge \"Set message id in notification redaction activity\" into nyc-mr1-dev
am: a02e5f73ca

Change-Id: Ia3593ca0a8d64da4efd09cf3c614e028d67e4189
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

Change-Id: I31282a637f8a9c2f4a92a47596d741e1149b1442
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
Steven Ng
c5ba27b885 Merge \\"Update the OEM unlock preference summary to reflect the disable reason\\" into nyc-mr1-dev am: dbb8cab438
am: 732418cc07

Change-Id: I7a72b986dfa509a0aebc902ed9081f8ef6f3fdaa
2016-06-27 19:24:22 +00:00
Steven Ng
732418cc07 Merge \"Update the OEM unlock preference summary to reflect the disable reason\" into nyc-mr1-dev
am: dbb8cab438

Change-Id: Ib90a577fdef5fad79c0bf84b8b50d35f2ff688ed
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
62917c23fa Merge \\"Disable \\"disable\\" button for the device provision app in the Settings app\\" into nyc-mr1-dev am: 8aee45afb6
am: 4e77176ca3

Change-Id: I86dbad08bd12a2200acc0b341800b2c17d227737
2016-06-27 19:06:29 +00:00
Steven Ng
4e77176ca3 Merge \"Disable \"disable\" button for the device provision app in the Settings app\" into nyc-mr1-dev
am: 8aee45afb6

Change-Id: Ic6fb6f14c8375acd1b0395ad879ae4868e7f7c79
2016-06-27 18:57:18 +00:00
Jason Monk
979e3ddf04 Merge \"Merge \\\"Fix DND conditional null state\\\" into nyc-dev am: 733649c2fa am: d944277d1f\" into nyc-mr1-dev-plus-aosp
am: 96169134bc

Change-Id: I876d3dcc6c752fd54d6f2a9e3af7dd93c167cc86
2016-06-27 18:50:49 +00:00
Jason Monk
3fc2ca0593 Merge \\\"Fix DND conditional null state\\\" into nyc-dev am: 733649c2fa am: 77fc052dd7
am: a7bb1b2f47

Change-Id: I7a69c5d7a5354926e4c4b782e10fbfae3b759c97
2016-06-27 18:50:49 +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

Change-Id: If6470542c1fbf62dcacfef2cb6d858c18e18cfc6
2016-06-27 18:46:31 +00:00
Jason Monk
5490451292 Merge \\"Fix DND conditional null state\\" into nyc-dev am: 733649c2fa
am: d944277d1f

Change-Id: Iff3a2eb2ecb4098237df16f035a054bfaf2b420a
2016-06-27 18:46:30 +00:00
Jason Monk
77fc052dd7 Merge \"Fix DND conditional null state\" into nyc-dev
am: 733649c2fa

Change-Id: Icd64312b660dc1c098772f97731241a9c9a6032c
2016-06-27 18:42:15 +00:00
Jason Monk
d944277d1f Merge \"Fix DND conditional null state\" into nyc-dev
am: 733649c2fa

Change-Id: I65fd9c378937f9ce634a679e6779368aa63fc143
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
3ebd6d61e0 Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours am: 98fd2d2a82 -s ours
am: 82b84aa9dd  -s ours

Change-Id: I8724958e451a73722003d8146d364edba6ec3ce9
2016-06-27 18:15:25 +00:00
Bill Yi
82b84aa9dd Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours
am: 98fd2d2a82  -s ours

Change-Id: I7ad92e537878e8eda1bbfccbb871cfc82f18febb
2016-06-27 18:09:39 +00:00
Bill Yi
833735ffdb Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: ee32cd8cd6 -s ours
am: 7bbd4c250d  -s ours

Change-Id: I8e703e38160deaedffd248a0e9baf5f450e7d3ae
2016-06-27 17:51:32 +00:00
Bill Yi
5bb628bc9b Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours am: 3040f703d7 -s ours
am: 1417a5b268  -s ours

Change-Id: I5183a52cdea96632273f993c40ab11001ae8f3c2
2016-06-27 17:51:31 +00:00