Doris Ling
df055c8655
Update spacing and background color for condition/suggestion.
...
- changed suggestion/condition and searchbox background color to
#F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp
Fix: 63393599
Test: visual
Change-Id: I4317781c93e23c6d019928b9fe9af16177f81c07
Merged-In: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:50:48 -07:00
Kevin Chyn
bab6e592bc
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev
...
am: 7bde506ed1
2017-07-11 22:36:47 +00:00
TreeHugger Robot
7bde506ed1
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev
2017-07-11 22:32:19 +00:00
jackqdyulei
4eba1d469c
Merge "Bind service in onCreate" into oc-dr1-dev
...
am: 4e4c73bfc7
2017-07-11 22:08:19 +00:00
TreeHugger Robot
4e4c73bfc7
Merge "Bind service in onCreate" into oc-dr1-dev
2017-07-11 22:02:35 +00:00
jackqdyulei
07fffc3877
Remove obsolete bluetooth pages
...
1. Remove BluetoothSettingsObsolete
2. Remove DeviceListPreferenceObsoleteFragment
3. Update master swtich, now constantly point to new page
4. Update the tests
Future cl will remove the page switch API in BluetoothFeatureProvider
Bug: 63444548
Test: Test still pass
Change-Id: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
Merged-In: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
2017-07-11 15:01:59 -07:00
Jack He
99eab3d5f9
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
...
am: 86fd147ac6
2017-07-11 21:22:40 +00:00
TreeHugger Robot
86fd147ac6
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
2017-07-11 21:16:32 +00:00
Stephen Chen
e549e732bd
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
...
am: 89fdea9807
2017-07-11 20:27:39 +00:00
TreeHugger Robot
89fdea9807
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
2017-07-11 20:21:01 +00:00
jackqdyulei
50b0daee90
Bind service in onCreate
...
This cl puts the binding to onCreate instead of constructor, so
preference controller won't bind/unbind service without registering
Lifecycle.
Bug: 62105045
Test: RunSettingsRoboTests
Change-Id: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
Merged-In: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
2017-07-11 13:17:38 -07:00
Kevin Chyn
599d4b93f3
Assist gesture title should not be translated, remove unused strings
...
Bug: 63441962
Test: manual && make -j RunSettingsRoboTests
Change-Id: I8b50ad378828f30f31dbfd648c9fac62af5d9da7
2017-07-11 13:17:37 -07:00
Daniel Nishi
4961451a4e
Merge "Expand ASM activation warning." into oc-dr1-dev
...
am: 64acb2906c
2017-07-11 19:56:41 +00:00
Daniel Nishi
64acb2906c
Merge "Expand ASM activation warning." into oc-dr1-dev
2017-07-11 19:46:19 +00:00
Jack He
a4503c5b8b
Bluetooth: mLocalAdapter should never be null
...
* mLocalAdapter should never be null
* We should crash if it is ever null
Bug: 63442969
Test: make, pair Bluetooth device
Change-Id: If98f9ea0762927eb57d00224b62abf24bbec69ba
2017-07-11 12:04:01 -07:00
Maurice Lam
ace9759446
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
...
am: 540d92a7e9
2017-07-11 18:27:30 +00:00
Maurice Lam
540d92a7e9
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
2017-07-11 18:21:43 +00:00
Geoffrey Pitsch
57adc290d2
Disable lift-to-wake when always-on is checked
...
The setting has little to no meaning when AOD is on.
Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
2017-07-11 14:05:03 -04:00
Daniel Nishi
8f345d7fd6
Expand ASM activation warning.
...
If the device had ASM enabled by default but still opted to disable ASM
for policy reasons, we need to start warning the user.
Change-Id: I6a296e95d00413308de3ddc565b42c5f605087e9
Fixes: 62105682
Test: Settings robotest
2017-07-11 09:51:14 -07:00
Bill Yi
219086822c
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: 75bcd075f2
2017-07-11 04:11:37 +00:00
Bill Yi
4a11531ec7
Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours
...
am: a8d19dc2e4
2017-07-11 04:08:17 +00:00
Bill Yi
81a9389ebd
Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours
...
am: 2865272522
2017-07-11 04:03:04 +00:00
TreeHugger Robot
75bcd075f2
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-11 04:01:24 +00:00
Bill Yi
a8d19dc2e4
Import translations. DO NOT MERGE am: 7267438b58 -s ours
...
am: 750540ae48
2017-07-11 03:55:40 +00:00
Bill Yi
2865272522
Import translations. DO NOT MERGE am: 7267438b58 -s ours
...
am: 750540ae48
2017-07-11 03:55:18 +00:00
Bill Yi
750540ae48
Import translations. DO NOT MERGE
...
am: 7267438b58
2017-07-11 03:47:35 +00:00
Kevin Chyn
b5b7ef69bf
Merge "Remove unnecessary keywords" into oc-dr1-dev
...
am: 9cf03c3884
2017-07-11 03:35:06 +00:00
Android Build Merger (Role)
51e0ed982c
Merge "Import translations. DO NOT MERGE am: f812f94216 -s ours am: c45dd3f1ec -s ours" into oc-dr1-dev-plus-aosp
2017-07-11 03:32:54 +00:00
Bill Yi
5076e0747b
Import translations. DO NOT MERGE am: f812f94216 -s ours
...
am: c45dd3f1ec
2017-07-11 03:32:38 +00:00
Bill Yi
bf24c5db83
Import translations. DO NOT MERGE am: f812f94216 -s ours
...
am: bc4faa93e2
2017-07-11 03:32:33 +00:00
TreeHugger Robot
9cf03c3884
Merge "Remove unnecessary keywords" into oc-dr1-dev
2017-07-11 03:31:06 +00:00
Bill Yi
c45dd3f1ec
Import translations. DO NOT MERGE
...
am: f812f94216
2017-07-11 03:30:04 +00:00
Bill Yi
bc4faa93e2
Import translations. DO NOT MERGE
...
am: f812f94216
2017-07-11 03:30:02 +00:00
Kevin Chyn
dde95f663a
Remove unnecessary keywords
...
Fixes: 63544783
Test: make -j RunSettingsRoboTests && manual
Change-Id: I6f6cb8aff365174edb7cd22f18cbc1b7e7ba5b4a
2017-07-11 03:23:21 +00:00
Maurice Lam
62c0c3c324
Hide screen lock options button in confirm lock
...
Hide the screen lock options button in the confirmation stage of
SetupChooseLockPassword, so the user cannot skip out of that screen
while the screen lock is being saved.
Test: Manual
Bug: 63526104
Change-Id: I8ee8938f3ddcd9f0ff3b1812fcae667eddaf09ab
2017-07-10 18:15:10 -07:00
Bill Yi
7267438b58
Import translations. DO NOT MERGE
...
Change-Id: Ifbee1421f45d2cb6f3d5c533e5c4e9a2735afa10
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 17:16:10 -07:00
Ajay Nadathur
6465041095
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
...
am: 73ae54a63a
2017-07-11 00:05:53 +00:00
TreeHugger Robot
73ae54a63a
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
2017-07-11 00:00:08 +00:00
Bill Yi
f812f94216
Import translations. DO NOT MERGE
...
Change-Id: Ifb8d0e63a8150656a55bb1b2adf5748c75a10224
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 16:49:52 -07:00
Matthew Fritze
a57c59bbba
Merge "Add location as a Inline list payload" into oc-dr1-dev
...
am: 9e2984b035
2017-07-10 23:32:11 +00:00
Bill Yi
85550c537b
Import translations. DO NOT MERGE
...
Change-Id: I827ed97b3afd80dd3e834b3cf686c6b1d4a65d25
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 16:23:41 -07:00
TreeHugger Robot
9e2984b035
Merge "Add location as a Inline list payload" into oc-dr1-dev
2017-07-10 23:23:13 +00:00
Fan Zhang
16afefd509
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
...
am: 5d3f6d566b
2017-07-10 21:31:39 +00:00
Ajay Nadathur
8c6910e9d5
Update notification redaction interstitial according to spec
...
bug: 38395294
Test: Manually tested and verified
Change-Id: Iddd53af604c65bb8e40c081f9538535bd3043ad4
2017-07-10 14:24:42 -07:00
TreeHugger Robot
5d3f6d566b
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
2017-07-10 21:23:15 +00:00
jackqdyulei
d6ff657b78
Init BatteryUtils in constructor
...
am: 116fec5b25
2017-07-10 20:22:03 +00:00
Fan Zhang
e67630ab16
Support multi line title for switch and edittext preferences
...
Change-Id: I898288a1e8c9d3bedae3f5f3269d4aa0fd2308f6
Fix: 63509156
Test: visual
2017-07-10 19:57:58 +00:00
kun.tang
d83e519871
Merge "Fix Phone crash when rorate screen on SimStatus." am: 3cbae7d6b5 am: d34ce65e22
...
am: a482b155f2
2017-07-10 19:26:03 +00:00
kun.tang
a482b155f2
Merge "Fix Phone crash when rorate screen on SimStatus." am: 3cbae7d6b5
...
am: d34ce65e22
2017-07-10 19:20:58 +00:00
kun.tang
d34ce65e22
Merge "Fix Phone crash when rorate screen on SimStatus."
...
am: 3cbae7d6b5
2017-07-10 19:17:03 +00:00
