Lei Yu
1ec3d85dda
Merge "Update the toggle state in constructor." into pi-dev am: 5cafb0b553
...
am: b6b1ee9abb
2018-03-23 01:08:15 +00:00
Fan Zhang
da8e3cddaa
Merge "Misc string updates" into pi-dev am: 4aa9d5d2b4
...
am: 015c57a38e
2018-03-23 01:07:28 +00:00
Lei Yu
b6b1ee9abb
Merge "Update the toggle state in constructor." into pi-dev
...
am: 5cafb0b553
2018-03-23 00:00:04 +00:00
Fan Zhang
015c57a38e
Merge "Misc string updates" into pi-dev
...
am: 4aa9d5d2b4
2018-03-22 23:59:09 +00:00
Sean Callanan
4b2d7a3780
Merge "[Settings] Add strings for Natural and Automatic color modes"
2018-03-22 23:53:11 +00:00
Maurice Lam
fd3d72e48f
Merge "Make GLIF theme default for confirm lock screen" into pi-dev am: a82183849d
...
am: 731b049e32
2018-03-22 23:11:11 +00:00
TreeHugger Robot
5cafb0b553
Merge "Update the toggle state in constructor." into pi-dev
2018-03-22 21:43:52 +00:00
TreeHugger Robot
4aa9d5d2b4
Merge "Misc string updates" into pi-dev
2018-03-22 21:33:54 +00:00
Maurice Lam
731b049e32
Merge "Make GLIF theme default for confirm lock screen" into pi-dev
...
am: a82183849d
2018-03-22 21:29:20 +00:00
Maurice Lam
a82183849d
Merge "Make GLIF theme default for confirm lock screen" into pi-dev
2018-03-22 21:04:17 +00:00
Sean Callanan
e8f9bf5f68
[Settings] Add strings for Natural and Automatic color modes
...
These strings are not properly reflected in the UI yet. Automatic and
Saturated currently map to the same display setting (and the UI reflects
this by checking both).
Bug: 75982435
Test: Modified the existing testcases to reflect the new string.
Change-Id: Iaef08599c0233e018eaafaf89d60eab92e102782
2018-03-22 13:05:32 -07:00
arangelov
16a945aca4
Merge "Put the FLAG_ACTIVITY_NEW_TASK flag for the "Learn More" button in the "Add Account" settings screen." into pi-dev am: edfdeebfe4
...
am: b23bf13e72
2018-03-22 19:53:01 +00:00
Fan Zhang
c1a0cb2aec
Misc string updates
...
Bug: 76022431
Fixes: 17822183
Test: visual
Change-Id: I952e04ca8f5d45612f0088729c2691c60cf3afab
2018-03-22 12:45:58 -07:00
Lei Yu
7c734ec32e
Merge "Add log for AnomalyDetectionJobService" into pi-dev am: b4b2a6260a
...
am: 3f25e3e004
2018-03-22 19:43:13 +00:00
arangelov
b23bf13e72
Merge "Put the FLAG_ACTIVITY_NEW_TASK flag for the "Learn More" button in the "Add Account" settings screen." into pi-dev
...
am: edfdeebfe4
2018-03-22 19:17:15 +00:00
Lei Yu
3f25e3e004
Merge "Add log for AnomalyDetectionJobService" into pi-dev
...
am: b4b2a6260a
2018-03-22 19:13:54 +00:00
TreeHugger Robot
edfdeebfe4
Merge "Put the FLAG_ACTIVITY_NEW_TASK flag for the "Learn More" button in the "Add Account" settings screen." into pi-dev
2018-03-22 18:38:30 +00:00
Lei Yu
592faf364d
Update the toggle state in constructor.
...
Before this cl, the update of toggle depends on BroadcastReceiver.
However it is not called when toggle is inited, which make the toggle in
broken state sometimes.
This cl make it execute the update method in constructor, so toggle can
get the correct state when it is created.
Fixes: 73718975
Test: RunSettingsRoboTests
Change-Id: Icb798afaff0bdeedad3a966315441712be2e2523
2018-03-22 11:18:43 -07:00
Lei Yu
b4b2a6260a
Merge "Add log for AnomalyDetectionJobService" into pi-dev
2018-03-22 17:53:17 +00:00
arangelov
737d469b78
Put the FLAG_ACTIVITY_NEW_TASK flag for the "Learn More" button in the "Add Account" settings screen.
...
Bug: 75322399
Test: Manually pressed the button and verified the Settings app does not crash.
Change-Id: Ibd2b985ed898ccaa4e78c0ecf5dc667af6bc8cba
2018-03-22 16:18:49 +00:00
Søren Gjesse
6734daaa66
Merge "Revert "Revert "Disable R8 for Settings"""
2018-03-22 09:28:11 +00:00
Søren Gjesse
6f21dfa213
Revert "Revert "Disable R8 for Settings""
...
This reverts commit f38d78bf09https://googleplex-android-review.git.corp.google.com/c/platform/packages/apps/Settings/+/3769994 lands.
Exempt-From-Owner-Approval: ccross@ made the requested change
Change-Id: I81dcb8c23974d3f3a8c11c39140d17266b4ae18a
2018-03-22 09:27:57 +00:00
Fan Zhang
4a4afa1de7
Merge "Fix crash when launching mobile data usage page via intent." into pi-dev am: f88dcfadbb
...
am: 60790e883c
2018-03-22 07:36:08 +00:00
Antony Sargent
458053b543
Merge "Fix renaming for Bluetooth devices when rotating to landscape" into pi-dev am: baea1c87f5
...
am: a3e36f8e50
2018-03-22 07:30:31 +00:00
Fan Zhang
60790e883c
Merge "Fix crash when launching mobile data usage page via intent." into pi-dev
...
am: f88dcfadbb
2018-03-22 07:29:16 +00:00
TreeHugger Robot
f88dcfadbb
Merge "Fix crash when launching mobile data usage page via intent." into pi-dev
2018-03-22 07:24:23 +00:00
Antony Sargent
a3e36f8e50
Merge "Fix renaming for Bluetooth devices when rotating to landscape" into pi-dev
...
am: baea1c87f5
2018-03-22 07:22:44 +00:00
TreeHugger Robot
baea1c87f5
Merge "Fix renaming for Bluetooth devices when rotating to landscape" into pi-dev
2018-03-22 07:17:17 +00:00
Doris Ling
175d61a01e
Merge "Fix crash when pausing DndCondition." into pi-dev am: e119601136
...
am: d8b61c21a0
2018-03-22 05:39:07 +00:00
anitalin
8debb12ed0
Merge "Remove extra padding above Wi-Fi picker, Pointer speed, Automatica date & time, Automatic timezone, Automatic 24-hour format, New notifications and App settings" into pi-dev am: 721c58deb4
...
am: a396fdb580
2018-03-22 05:34:31 +00:00
Shawn Ding
50d98df148
Merge "Update "Vibrate on tap" string" into pi-dev am: bad38a1940
...
am: 4d8b920c7e
2018-03-22 05:33:52 +00:00
Andreas Terzis
7130de5fb6
Merge "Add back the data saver preference." into pi-dev am: ce447d9191
...
am: fa50690b29
2018-03-22 05:29:10 +00:00
Doris Ling
d8b61c21a0
Merge "Fix crash when pausing DndCondition." into pi-dev
...
am: e119601136
2018-03-22 05:26:50 +00:00
anitalin
a396fdb580
Merge "Remove extra padding above Wi-Fi picker, Pointer speed, Automatica date & time, Automatic timezone, Automatic 24-hour format, New notifications and App settings" into pi-dev
...
am: 721c58deb4
2018-03-22 05:26:10 +00:00
Shawn Ding
4d8b920c7e
Merge "Update "Vibrate on tap" string" into pi-dev
...
am: bad38a1940
2018-03-22 05:24:46 +00:00
Andreas Terzis
fa50690b29
Merge "Add back the data saver preference." into pi-dev
...
am: ce447d9191
2018-03-22 05:14:10 +00:00
TreeHugger Robot
e119601136
Merge "Fix crash when pausing DndCondition." into pi-dev
2018-03-22 05:06:15 +00:00
TreeHugger Robot
721c58deb4
Merge "Remove extra padding above Wi-Fi picker, Pointer speed, Automatica date & time, Automatic timezone, Automatic 24-hour format, New notifications and App settings" into pi-dev
2018-03-22 05:05:21 +00:00
TreeHugger Robot
bad38a1940
Merge "Update "Vibrate on tap" string" into pi-dev
2018-03-22 05:03:38 +00:00
TreeHugger Robot
ce447d9191
Merge "Add back the data saver preference." into pi-dev
2018-03-22 04:56:35 +00:00
Fan Zhang
dad7af995b
Merge "use placeholder text for "turn on battery saver at x%" pref" into pi-dev am: c15e8d3d09
...
am: 39256ded6e
2018-03-22 04:43:16 +00:00
Lei Yu
2eb69b56ed
Merge "Only show restricted apps that belong to the user." into pi-dev am: 5464549257
...
am: ad1549b54d
2018-03-22 04:42:34 +00:00
Fan Zhang
39256ded6e
Merge "use placeholder text for "turn on battery saver at x%" pref" into pi-dev
...
am: c15e8d3d09
2018-03-22 04:36:48 +00:00
Lei Yu
ad1549b54d
Merge "Only show restricted apps that belong to the user." into pi-dev
...
am: 5464549257
2018-03-22 04:36:06 +00:00
TreeHugger Robot
c15e8d3d09
Merge "use placeholder text for "turn on battery saver at x%" pref" into pi-dev
2018-03-22 04:32:18 +00:00
TreeHugger Robot
5464549257
Merge "Only show restricted apps that belong to the user." into pi-dev
2018-03-22 04:31:38 +00:00
WAYNE YANG
a3ede6d515
Merge "Fix "Send feedback about this device" option is missing issue." into pi-dev am: 2d230e1431
...
am: 800a8dcb9a
2018-03-22 04:14:26 +00:00
WAYNE YANG
800a8dcb9a
Merge "Fix "Send feedback about this device" option is missing issue." into pi-dev
...
am: 2d230e1431
2018-03-22 04:07:56 +00:00
WAYNE YANG
2d230e1431
Merge "Fix "Send feedback about this device" option is missing issue." into pi-dev
2018-03-22 03:56:41 +00:00
Jan Nordqvist
13fd8bef8a
Merge "Fix entity header to "Hide" shadow of app bar unless scrolled." into pi-dev am: 58a8b09e7b
...
am: cc7a739e6b
2018-03-22 03:43:55 +00:00
