Steven Ng
62917c23fa
Merge \\"Disable \\"disable\\" button for the device provision app in the Settings app\\" into nyc-mr1-dev am: 8aee45afb6
...
am: 4e77176ca3
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
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
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
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
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
3ebd6d61e0
Import translations. DO NOT MERGE am: 5a9f7d6c9a -s ours am: 98fd2d2a82 -s ours
...
am: 82b84aa9dd
2016-06-27 18:15:25 +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
833735ffdb
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: ee32cd8cd6 -s ours
...
am: 7bbd4c250d
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
2016-06-27 17:51:31 +00:00
Victor Chang
2d97a6a9fe
Merge \\"Add explanatory text displayed when \\'Always-on\\' switch is greyed-out for VPN apps w/targetSdk<24\\" into nyc-mr1-dev am: 4ffd7552a3
...
am: 8dc82cb436
2016-06-27 17:51:30 +00:00
Doris Ling
68da9b2f34
Merge \\"Update UI for the Gestures settings.\\" into nyc-mr1-dev am: 8661620b3a
...
am: fe4481899e
2016-06-27 17:51:29 +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
43703b78bd
Merge "Import translations. DO NOT MERGE"
2016-06-27 17:28:58 +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
990208aeed
Merge \\"When offline show a list of countries with phone support.\\" into nyc-mr1-dev am: e9fcb2c930
...
am: d2b3809cae
2016-06-27 15:52:22 +00: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
Nicolas Prevot
bdd1bf86ea
Don't dismiss remove work profile dialog on orientation change.
...
Use a DialogFragment.
BUG:19635753
Change-Id: I6ef34e3eea3e55e0e827b77d4f2cc7d22f7cc8b5
2016-06-27 15:12:05 +01:00
Ricky Wai
3029bb9eb7
Set message id in notification redaction activity
...
Bug: 29633162
Change-Id: I803789ba719d4f40629a8da49b47cf4548c072f0
2016-06-27 15:02:19 +01:00
Bill Yi
cfc13dd889
Import translations. DO NOT MERGE
...
Change-Id: I0a563c30d5cc2265c446a4c5c8651821044f73d1
Auto-generated-cl: translation import
2016-06-27 06:58:29 -07: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
a15b20a29c
Merge \\"Remove setup specific FP find sensor layout\\" into nyc-mr1-dev am: 17eb2e2ec4
...
am: ff56688d64
2016-06-25 01:38:39 +00:00
Maurice Lam
ff56688d64
Merge \"Remove setup specific FP find sensor layout\" into nyc-mr1-dev
...
am: 17eb2e2ec4
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
Evan Rosky
c3efefb027
Merge "Option to hide swipe method"
2016-06-24 21:36:39 +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
e9a6118235
Fix crash in AppDataUsage am: 3763b581a3 am: f96376a186
...
am: 87c6bc8ce9
2016-06-24 20:37:46 +00:00
Jason Monk
87c6bc8ce9
Fix crash in AppDataUsage am: 3763b581a3
...
am: f96376a186
2016-06-24 20:32:46 +00:00
Jason Monk
14d52fb974
Fix crash in AppDataUsage am: 3763b581a3 am: 55f6f052e4
...
am: 0795570d00
2016-06-24 20:31:42 +00:00
Jason Monk
0795570d00
Fix crash in AppDataUsage am: 3763b581a3
...
am: 55f6f052e4
2016-06-24 20:29:11 +00:00
Jason Monk
55f6f052e4
Fix crash in AppDataUsage
...
am: 3763b581a3
2016-06-24 20:26:50 +00:00
