Bill Yi
734fa3e361
Import translations. DO NOT MERGE am: f812f94216 -s ours am: bc4faa93e2 -s ours
...
am: bf24c5db83
2017-07-11 03:35:05 +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
TreeHugger Robot
cd3e5bf6c8
Merge "Search cleanu-np: remove useless summary from some settings"
2017-07-11 00:25:50 +00:00
TreeHugger Robot
ce9e90a740
Merge "Entity header layout cleanup"
2017-07-11 00:21:41 +00: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
bd013f0099
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev am: 73ae54a63a
...
am: 6465041095
2017-07-11 00:08:51 +00: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
1e099ee60a
Merge "Add location as a Inline list payload" into oc-dr1-dev am: 9e2984b035
...
am: a57c59bbba
2017-07-10 23:35:21 +00: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
Rajeev Kumar
58878fcb33
Merge "Get rid of unused IconPreferenceScreen"
2017-07-10 23:11:54 +00:00
Fan Zhang
1befb49813
Search cleanu-np: remove useless summary from some settings
...
Change-Id: Ie5c953f594bf1d364c0aa1a99f9363756ac5802f
Fix: 63014636
Test: robotests
2017-07-10 15:36:58 -07:00
Fan Zhang
64cac99448
Entity header layout cleanup
...
Change-Id: I866231e3a6cb506e3aa1c03f2cbead1049270999
Fix: 63339943
Test: visual
2017-07-10 15:13:17 -07:00
Fan Zhang
f559395603
Use preference theme from SettingsLib
...
Bug: 36663882
Test: rerun robotests
Change-Id: I9f0f51a9d070191f5bf8f3315fef4d997d6213c3
2017-07-10 14:56:49 -07:00
Fan Zhang
62a3220efb
Use a grey shade under progress spinner in wifi settings
...
Change-Id: I1c3fa3a05fe66924989607d73e77ca2616a898e6
Fix: 62545533
Test: visual
2017-07-10 14:46:29 -07:00
Rajeev Kumar
5c279e4bce
Merge "Recycle TypedArray in FixedLineSummaryPreference"
2017-07-10 21:41:41 +00:00
Fan Zhang
7a56184063
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev am: 5d3f6d566b
...
am: 16afefd509
2017-07-10 21:36:10 +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
TreeHugger Robot
f74878dca3
Merge "Import translations. DO NOT MERGE"
2017-07-10 20:52:21 +00:00
Rajeev Kumar
af8f6beebb
Get rid of unused IconPreferenceScreen
...
Change-Id: Ia1e0f3caf80da27c895cbf85320129b7540d8b41
2017-07-10 13:46:50 -07:00
jackqdyulei
17bae5fa57
Init BatteryUtils in constructor am: 116fec5b25
...
am: d6ff657b78
2017-07-10 20:26:35 +00:00
jackqdyulei
d6ff657b78
Init BatteryUtils in constructor
...
am: 116fec5b25
2017-07-10 20:22:03 +00:00
TreeHugger Robot
4553225ab5
Merge "Add location as a Inline list payload"
2017-07-10 20:18:42 +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
Rajeev Kumar
b82304251a
Recycle TypedArray in FixedLineSummaryPreference
...
Change-Id: I3aefad2081751f778fd2b32c6e05921131b84547
2017-07-10 12:40:26 -07:00
kun.tang
6e6257fb24
Merge "Fix Phone crash when rorate screen on SimStatus." am: 3cbae7d6b5 am: d34ce65e22 am: a482b155f2
...
am: d83e519871
2017-07-10 19:30:30 +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
Treehugger Robot
3cbae7d6b5
Merge "Fix Phone crash when rorate screen on SimStatus."
2017-07-10 19:08:11 +00:00
TreeHugger Robot
a9b1cca103
Merge "Fix build"
2017-07-10 19:06:50 +00:00
Matthew Fritze
0609c4c281
Add location as a Inline list payload
...
The inline payload is added to security settings because
security settings indexes the setting with the key
"location" which corresponds with the correct
PreferenceController, LocationPreferenceController.
However, we suppress the Location search result, so to
avoid confusion later, we don't include the ResultPayload
in the search indexing.
Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ica9b775fe7b43259e651f95b079b8cccb29d0ea8
Merged-In: Ic5515d38064498ae908f4cefedfeb3c2a2af449c
2017-07-10 18:21:15 +00:00
Matthew Fritze
ea72afa330
Add location as a Inline list payload
...
The inline payload is added to security settings because
security settings indexes the setting with the key
"location" which corresponds with the correct
PreferenceController, LocationPreferenceController.
However, we suppress the Location search result, so to
avoid confusion later, we don't include the ResultPayload
in the search indexing.
Merge from: ag/2511709/
Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: Ic5515d38064498ae908f4cefedfeb3c2a2af449c
2017-07-10 11:20:02 -07:00
jackqdyulei
116fec5b25
Init BatteryUtils in constructor
...
In this case we won't have the NPE.
Bug: 63526637
Test: RunSettingsRoboTests
Change-Id: I20375e535ba07deddacf74052f31476e0cb28e56
2017-07-10 11:08:12 -07:00
Fan Zhang
b886c1613c
Fix build
...
Change-Id: I0accc5b7c753ff85a56f5dfc17f7d9aa8eb7cd9a
Fix: 63525553
Test: RunSettingsRoboTests
2017-07-10 10:23:07 -07:00
Christine Franks
250595ae11
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev am: 8dc795d64b
...
am: 1be5af80ec
2017-07-10 14:13:02 +00:00
Christine Franks
1be5af80ec
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
...
am: 8dc795d64b
2017-07-10 13:57:38 +00:00
Christine Franks
8dc795d64b
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
2017-07-10 13:51:39 +00:00
