Commit Graph

37969 Commits

Author SHA1 Message Date
Bill Yi
c183765a84 Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours am: a8d19dc2e4 -s ours
am: 4a11531ec7  -s ours

Change-Id: I9cdbcf32e517361752d0b5868671f8cc0df2fc15
2017-07-11 04:18:29 +00:00
Bill Yi
6cc94bf656 Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours am: 2865272522 -s ours
am: 81a9389ebd  -s ours

Change-Id: Id15b3a7b0175943e4c0a83af64643d7bc611c09c
2017-07-11 04:18:09 +00:00
Bill Yi
4a11531ec7 Import translations. DO NOT MERGE am: 7267438b58 -s ours am: 750540ae48 -s ours
am: a8d19dc2e4  -s ours

Change-Id: I86658e992835680c75c69cd869acb314d5b93c3e
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  -s ours

Change-Id: I0b8b30eda46b1997915adf4ee3921657bdb477a5
2017-07-11 04:03:04 +00:00
Bill Yi
a8d19dc2e4 Import translations. DO NOT MERGE am: 7267438b58 -s ours
am: 750540ae48  -s ours

Change-Id: Ie4b8baffb9d82f30bef5251893124152a66f8f1c
2017-07-11 03:55:40 +00:00
Bill Yi
2865272522 Import translations. DO NOT MERGE am: 7267438b58 -s ours
am: 750540ae48  -s ours

Change-Id: If2ede8c90fef89686c2ea93765e7d7acab7e9c26
2017-07-11 03:55:18 +00:00
Bill Yi
750540ae48 Import translations. DO NOT MERGE
am: 7267438b58  -s ours

Change-Id: Id5933547a1b04477e00dbef1fd88382a01e02891
2017-07-11 03:47:35 +00:00
Kevin Chyn
c10561bda2 Merge "Remove unnecessary keywords" into oc-dr1-dev am: 9cf03c3884
am: b5b7ef69bf

Change-Id: I8abf3025eb9b08283b19af3caba6100c46957ae0
2017-07-11 03:37:34 +00:00
Bill Yi
3ad1659a9a Merge "Import translations. DO NOT MERGE am: f812f94216 -s ours am: c45dd3f1ec -s ours" into oc-dr1-dev-plus-aosp
am: 51e0ed982c  -s ours

Change-Id: Ib0364671f7637f59a29c29abd90b7ddbf8b39f63
2017-07-11 03:35:23 +00:00
Kevin Chyn
b5b7ef69bf Merge "Remove unnecessary keywords" into oc-dr1-dev
am: 9cf03c3884

Change-Id: I71026b6b9fa79608afd466cfce56e4be203c610d
2017-07-11 03:35:06 +00:00
Bill Yi
734fa3e361 Import translations. DO NOT MERGE am: f812f94216 -s ours am: bc4faa93e2 -s ours
am: bf24c5db83  -s ours

Change-Id: If9f14b394f7fc6148ac621daa513319bfdfbaeba
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  -s ours

Change-Id: Ic5a239ac412ccb46da32f08843c039cc4313a67b
2017-07-11 03:32:38 +00:00
Bill Yi
bf24c5db83 Import translations. DO NOT MERGE am: f812f94216 -s ours
am: bc4faa93e2  -s ours

Change-Id: I0de19fee01ce891ca72ed5276186cb18f3e49566
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  -s ours

Change-Id: Id14fbf7f7822ce74772c66410f9bd69e9ecba388
2017-07-11 03:30:04 +00:00
Bill Yi
bc4faa93e2 Import translations. DO NOT MERGE
am: f812f94216  -s ours

Change-Id: If3bc9ec99810524fde2cf69d6a43f4995ed9306a
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
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

Change-Id: Ifbdfc7d44f36fbeb421e45cd27963f51f62e3dbb
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

Change-Id: I1650614a64463f537edb752d58bc0c05ddf3d5b6
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  -s ours

Change-Id: Iee97e0422a6bec13a2463d3d57f3d6611f4815a1
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

Change-Id: Iad7aa04e35d7853ade051e5a711632b20b2fbcbe
2017-07-10 23:32:11 +00: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
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

Change-Id: Id24c066d913dcab8532b42211dad25e61e2dc0bd
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

Change-Id: Ifd5f8aae85864e2a264ea76e28700cf82a0bfac5
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

Change-Id: I876a9fc869ae48ef6bf45080c6036980423d1fe5
2017-07-10 20:26:35 +00:00
jackqdyulei
d6ff657b78 Init BatteryUtils in constructor
am: 116fec5b25

Change-Id: I74636f77f8ee44576894ed25eb48212386f8ee40
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

Change-Id: I1de0b48f92686e0cca42c23520cedf512a659579
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

Change-Id: I31ae1b4a34bd61bceb607d2fa4c6176bbe27af75
2017-07-10 19:26:03 +00:00
kun.tang
a482b155f2 Merge "Fix Phone crash when rorate screen on SimStatus." am: 3cbae7d6b5
am: d34ce65e22

Change-Id: Ic806452e621c14431576fe4c5ed848ae005122c1
2017-07-10 19:20:58 +00:00
kun.tang
d34ce65e22 Merge "Fix Phone crash when rorate screen on SimStatus."
am: 3cbae7d6b5

Change-Id: I3c968a9bbd7bb687aae53d5d74a9a2b3e38bcbae
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