Makoto Onuki
8fd3c226e0
Merge \\"Restore \\"reset ShortcutManager rate limiting\\" dev option\\" into nyc-mr1-dev am: ed9aed1878
...
am: 5922902ab3
2016-07-12 02:44:18 +00:00
Victor Chang
994b72cd7b
Merge \\"Fix always-on is not turned off when user forgets vpn\\" into nyc-mr1-dev am: 9505b78e29
...
am: d308bbc358
2016-07-12 02:44:18 +00:00
Maurice Lam
d776f53ecd
Merge \"Update button styles for fingerprint\" into nyc-mr1-dev
...
am: 68d65abaaa
2016-07-12 02:01:46 +00:00
Maurice Lam
68d65abaaa
Merge "Update button styles for fingerprint" into nyc-mr1-dev
2016-07-12 01:51:11 +00:00
Doris Ling
e778a6635b
Merge \\"Add handling for gesture settings for double twist for camera flip.\\" into nyc-mr1-dev am: 94c8f7ea7e
...
am: b209123dca
2016-07-12 01:32:45 +00:00
Maurice Lam
932b49408d
Merge \"Fix PIN screen title\" into nyc-mr1-dev
...
am: 79321c480f
2016-07-11 21:45:36 +00:00
Maurice Lam
79321c480f
Merge "Fix PIN screen title" into nyc-mr1-dev
2016-07-11 21:33:04 +00:00
Makoto Onuki
5922902ab3
Merge \"Restore \"reset ShortcutManager rate limiting\" dev option\" into nyc-mr1-dev
...
am: ed9aed1878
2016-07-11 18:09:18 +00:00
Makoto Onuki
ed9aed1878
Merge "Restore "reset ShortcutManager rate limiting" dev option" into nyc-mr1-dev
2016-07-11 17:54:27 +00:00
Maurice Lam
44f2736f54
Fix PIN screen title
...
Set the header text of the screen after Activity.setTitle is called,
so that the PIN screen will show the PIN text as header, as opposed to
the default which is always "password".
Bug: 30041779
Change-Id: I525bd4e5c51252410fdeb0424329bbfbd86e5b7d
2016-07-11 17:48:09 +00:00
Victor Chang
d308bbc358
Merge \"Fix always-on is not turned off when user forgets vpn\" into nyc-mr1-dev
...
am: 9505b78e29
2016-07-11 14:08:09 +00:00
Victor Chang
9505b78e29
Merge "Fix always-on is not turned off when user forgets vpn" into nyc-mr1-dev
2016-07-11 13:56:08 +00:00
Julia Reynolds
2c1eb80b1d
Correct logic for showing overide dnd field.
...
Change-Id: Iae1d053d3816ccdae9f6d9bc6a16622b50e07440
Fixes: 29995563
2016-07-11 09:10:11 -04:00
Doris Ling
b209123dca
Merge \"Add handling for gesture settings for double twist for camera flip.\" into nyc-mr1-dev
...
am: 94c8f7ea7e
2016-07-09 00:03:11 +00:00
Doris Ling
94c8f7ea7e
Merge "Add handling for gesture settings for double twist for camera flip." into nyc-mr1-dev
2016-07-08 23:58:47 +00:00
Justin Klaassen
1863ffc982
resolve merge conflicts of 67b3a94 to master
...
Change-Id: I8fabdf019fea12793c54745390ed4669118548d0
2016-07-08 14:40:55 -07:00
Justin Klaassen
67b3a94b81
Merge \"Add Night display settings\" into nyc-mr1-dev
...
am: e577ed1b91
2016-07-08 21:15:39 +00:00
Justin Klaassen
e577ed1b91
Merge "Add Night display settings" into nyc-mr1-dev
2016-07-08 21:07:48 +00:00
Fan Zhang
34969b0044
UI updates for support tab. am: 48aab452cb
...
am: 0e2c45b5df
2016-07-08 19:25:11 +00:00
Fan Zhang
0e2c45b5df
UI updates for support tab.
...
am: 48aab452cb
2016-07-08 19:21:26 +00:00
Justin Klaassen
c7cd2982cd
Add Night display settings
...
Bug: 28615069
Change-Id: I2e8a374a00c06c06d419a6ff46cd3b5d544c1d3e
2016-07-08 11:48:02 -07:00
Doris Ling
6b1a2a8cc8
Add handling for gesture settings for double twist for camera flip.
...
Add handling for updating the secure settings for camera double twist
when user updates the on/off toggle, and move
SYSTEM_NAVIGATION_KEYS_ENABLED from Global to Secure.
Bug: 29869445
Change-Id: Iebb937509a661b012688a3eb36efe08d2292ff26
2016-07-08 10:37:16 -07:00
Fan Zhang
48aab452cb
UI updates for support tab.
...
Fixes: 29999181
Fixes: 29397123
- Reduce support tile min height to 48dp.
- Add a 8dp spacer between escalation card and first support tile.
- Show different off-hour support escalation title when support hour is
always avaiable.
Change-Id: I4dacf2b375734c4819b9b19b68fc84faf083c0d4
2016-07-08 10:26:29 -07:00
Makoto Onuki
0651701930
Restore "reset ShortcutManager rate limiting" dev option
...
Bug 30031093
Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72
2016-07-08 09:37:48 -07:00
TreeHugger Robot
9298f8c604
Merge "Announce user credential deletions"
2016-07-07 16:54:31 +00:00
Fan Zhang
fb4c548b78
Fix strings for support tab. am: 4178710f3d
...
am: caf4498597
2016-07-07 15:40:16 +00:00
Fan Zhang
caf4498597
Fix strings for support tab.
...
am: 4178710f3d
2016-07-07 15:37:23 +00:00
Fan Zhang
4178710f3d
Fix strings for support tab.
...
Bug: 29105266
- Fix typos in string and comments
- Use 2 different strings for off-hour and off-line cases.
Change-Id: I63859605ff7185d5f8cc66fd31b56f1d09ed11aa
2016-07-07 08:27:25 -07:00
Fan Zhang
e2443c0404
Merge \\"Use phone number as summary for \\'About Phone\\'.\\" into nyc-mr1-dev am: 071f62954d
...
am: 93acb63447
2016-07-07 00:27:30 +00:00
Fan Zhang
93acb63447
Merge \"Use phone number as summary for \'About Phone\'.\" into nyc-mr1-dev
...
am: 071f62954d
2016-07-07 00:20:59 +00:00
TreeHugger Robot
071f62954d
Merge "Use phone number as summary for 'About Phone'." into nyc-mr1-dev
2016-07-07 00:14:08 +00:00
Fan Zhang
ad2114e99b
Use phone number as summary for 'About Phone'.
...
Bug: 28419411
Change-Id: I3ac57a770bf4d7416459dadedf91c3d6cefbc6b4
2016-07-06 15:32:29 -07:00
Doris Ling
2ed8651f1f
Merge \\"Fix layout transition from Display->Ambient Display to Gestures\\" into nyc-mr1-dev am: 3633058181
...
am: e4b305a0f0
2016-07-06 22:29:27 +00:00
Doris Ling
e4b305a0f0
Merge \"Fix layout transition from Display->Ambient Display to Gestures\" into nyc-mr1-dev
...
am: 3633058181
2016-07-06 22:20:07 +00:00
Doris Ling
3633058181
Merge "Fix layout transition from Display->Ambient Display to Gestures" into nyc-mr1-dev
2016-07-06 22:08:08 +00:00
Fan Zhang
7b410d1e4b
Merge \\"Add logging when click tollfree/tolled phone support button\\" into nyc-mr1-dev am: a0eb2997a9
...
am: 5efd8009df
2016-07-06 20:59:52 +00:00
Fan Zhang
5efd8009df
Merge \"Add logging when click tollfree/tolled phone support button\" into nyc-mr1-dev
...
am: a0eb2997a9
2016-07-06 20:56:03 +00:00
TreeHugger Robot
a0eb2997a9
Merge "Add logging when click tollfree/tolled phone support button" into nyc-mr1-dev
2016-07-06 20:44:04 +00:00
Fan Zhang
121a654084
Merge \\"Remove search in support tab.\\" into nyc-mr1-dev am: bae81b4a6f
...
am: afa4fff821
2016-07-06 20:26:29 +00:00
Doris Ling
9a3cf7725b
Fix layout transition from Display->Ambient Display to Gestures
...
1. Add handling in Gestures settings to scroll to the corresponding
preference when launching from Display->Ambient Display
2. Remove the bitmap creation for the video preview image
3. Use a custom aspect ration framee layout to hold the animation
instead to avoid resizing of the animation view.
Bug: 29795707
Change-Id: I67209ba2508a93da4fc46ff20986309dbe5a83d5
2016-07-06 13:21:08 -07:00
Fan Zhang
afa4fff821
Merge \"Remove search in support tab.\" into nyc-mr1-dev
...
am: bae81b4a6f
2016-07-06 20:14:46 +00:00
Fan Zhang
bae81b4a6f
Merge "Remove search in support tab." into nyc-mr1-dev
2016-07-06 20:09:10 +00:00
Maurice Lam
584a11ec4a
Update button styles for fingerprint
...
Use button styles instead of list style because of UX spec change.
Bug: 29421687
Change-Id: Icf178c881c2325b6183de8667a5657b3d2088f72
2016-07-06 18:15:06 +00:00
Victor Chang
fcb0d74a3c
Fix always-on is not turned off when user forgets vpn
...
Change-Id: Iad285ff06abde71ef040cbb29f740bcf20c3bbb7
Fix: 29991174
2016-07-06 18:27:55 +01:00
Fan Zhang
ece8ff63b6
Remove search in support tab.
...
Bug: 29397123
Change-Id: Id2d43724696c04e890adba562b5476e1834779da
2016-07-06 09:54:07 -07:00
Robin Lee
2ac7bc0565
Merge \"Don\'t show always-on option connecting PPTP vpn\" into nyc-mr1-dev
...
am: 1926ed9f83
2016-07-06 10:35:11 +00:00
Robin Lee
1926ed9f83
Merge "Don't show always-on option connecting PPTP vpn" into nyc-mr1-dev
2016-07-06 10:30:13 +00:00
Tony Mak
b62a70db93
Merge \"Show info icon when RestrictedListPreference is disabled\" into nyc-mr1-dev
...
am: b0a4c897ac
2016-07-06 09:07:02 +00:00
Abodunrinwa Toki
6306044706
Merge "Fix order of items in language menu."
2016-07-04 13:45:49 +00:00
Tony Mak
1e25ba3ed1
Show info icon when RestrictedListPreference is disabled
...
Fix: 29766349
2016-07-04 04:01:49 +00:00
