Commit Graph

28306 Commits

Author SHA1 Message Date
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
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

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
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
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
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
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
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
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
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
98fd2d2a82 Import translations. DO NOT MERGE
am: 5a9f7d6c9a  -s ours

Change-Id: I5007277d9a3e980671925b717d4ae2376f1d37f7
2016-06-27 17:50:21 +00:00
Bill Yi
7bbd4c250d Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: ee32cd8cd6  -s ours

Change-Id: I4f5b370c10e7c5fee36c780a41b3c64d7c268dce
2016-06-27 17:38:42 +00:00
Bill Yi
1417a5b268 Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours
am: 3040f703d7  -s ours

Change-Id: Ie26f22a668e452286a9588ed2458207302681aa8
2016-06-27 17:37:30 +00:00
Bill Yi
3040f703d7 Import translations. DO NOT MERGE
am: 5a9f7d6c9a  -s ours

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

Change-Id: Id90c39eba4f3ce589dd29fe59177f45e7b684c2f
2016-06-27 17:19:41 +00:00
Doris Ling
fe4481899e Merge \"Update UI for the Gestures settings.\" into nyc-mr1-dev
am: 8661620b3a

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

Change-Id: Ic97ecb3c2da78209e58b4a01f5adfbb23d32b32f
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
Ricky Wai
3029bb9eb7 Set message id in notification redaction activity
Bug: 29633162
Change-Id: I803789ba719d4f40629a8da49b47cf4548c072f0
2016-06-27 15:02:19 +01:00
Ricky Wai
9aa434cde6 Refresh screenlock UI after password verification failed
Bug: 28314264
Change-Id: Ibd715d70bbee728a887f779a24bb99ad32d8d2ed
2016-06-27 11:10:09 +01:00
Maurice Lam
ff56688d64 Merge \"Remove setup specific FP find sensor layout\" into nyc-mr1-dev
am: 17eb2e2ec4

Change-Id: I9914bce9a3c8e4f7e87692a27df87bd2d6532a1a
2016-06-25 01:35:26 +00:00
Maurice Lam
17eb2e2ec4 Merge "Remove setup specific FP find sensor layout" into nyc-mr1-dev 2016-06-25 01:28:42 +00:00
Fan Zhang
a44b1efbdc When offline show a list of countries with phone support.
Bug: 29105266

TODO:
- Support phones UI for international travel
- Selecting default country
- Show operation hours for selected country

Change-Id: I08a6780497dfcb9b9dc8670f2705d01df021c57b
2016-06-24 14:02:30 -07:00
Doris Ling
b4d41d8c71 Update UI for the Gestures settings.
1. Remove list divider
2. Set title background color to white
3. Set color filter on animation preview so that its color matches the
color of the video.

Bug: 28565958
Change-Id: I496915ebdb8e358a0f7682f6075d32a04d8d358a
2016-06-24 13:54:47 -07:00
Jason Monk
87c6bc8ce9 Fix crash in AppDataUsage am: 3763b581a3
am: f96376a186

Change-Id: I6c261c25292887fad35b963bfce5847dc20d97df
2016-06-24 20:32:46 +00:00
Jason Monk
0795570d00 Fix crash in AppDataUsage am: 3763b581a3
am: 55f6f052e4

Change-Id: I0e869cb33d5106cbe35029e44180fb51c8382d21
2016-06-24 20:29:11 +00:00
Jason Monk
55f6f052e4 Fix crash in AppDataUsage
am: 3763b581a3

Change-Id: I17025581ac647185444b0eaf4ff7f572bca23efd
2016-06-24 20:26:50 +00:00
Jason Monk
f96376a186 Fix crash in AppDataUsage
am: 3763b581a3

Change-Id: I457ee4ed3c1c83d95f20e8c9004918a140f328a7
2016-06-24 20:26:48 +00:00
mariagpuyol
eb086f075e Make Emergency info searchable in Settings
am: 6056eba0e7

Change-Id: I09900a3059d69f870f8f5efdabad4c67cadf49ae
2016-06-24 17:12:40 +00:00