Pengquan Meng
ae49fee55c
[automerger skipped] Merge "Add apn data structure" into pi-dev am: dbf8a678ae
...
am: 89918e3209
-s ours
Change-Id: I9ba2c1d14a08a187ca702eeb49d0e884e8a6e93d
2018-03-30 21:10:35 +00:00
Pengquan Meng
89918e3209
Merge "Add apn data structure" into pi-dev
...
am: dbf8a678ae
Change-Id: Ib6f5840689a924b26468c88ef0e68d8e97195e76
2018-03-30 18:56:22 +00:00
Rubin Xu
228246d47f
Merge "Remove password blacklist check" into pi-dev am: 48283ec44c
...
am: d982a37476
Change-Id: I0c90b8cfb3dbec57cac00c55666e79dd0d32fc90
2018-03-30 18:24:21 +00:00
Pengquan Meng
dbf8a678ae
Merge "Add apn data structure" into pi-dev
2018-03-30 17:00:35 +00:00
Rubin Xu
d982a37476
Merge "Remove password blacklist check" into pi-dev
...
am: 48283ec44c
Change-Id: I443bf5991b0cd0f859c63c48589eca7e872b4a25
2018-03-30 13:50:19 +00:00
Rubin Xu
48283ec44c
Merge "Remove password blacklist check" into pi-dev
2018-03-30 13:38:31 +00:00
Beverly
ffddcf0c95
Merge "Dnd 'blink light' option only if phone has LED" into pi-dev am: efa1cde042
...
am: 84b51371a9
Change-Id: Ie21dbfea9917f50b1cb533d28a84829739623a76
2018-03-30 13:37:26 +00:00
Beverly
84b51371a9
Merge "Dnd 'blink light' option only if phone has LED" into pi-dev
...
am: efa1cde042
Change-Id: Ibf201c126141cea6fb84660e93450e8fc6f61c33
2018-03-30 13:27:52 +00:00
TreeHugger Robot
efa1cde042
Merge "Dnd 'blink light' option only if phone has LED" into pi-dev
2018-03-30 13:16:25 +00:00
Andreas Terzis
9b6736181c
Top line should show "Primary data" for users with > 1 plans. am: ca9bf3b7ed
...
am: 72bc4088f8
Change-Id: Iea4a2696eac87ac3160cf74e87c5b76142609245
2018-03-30 08:27:07 +00:00
Andreas Terzis
72bc4088f8
Top line should show "Primary data" for users with > 1 plans.
...
am: ca9bf3b7ed
Change-Id: I5b8590c3a3b76ffa58ca25f8ee6242aa8f1ba1a7
2018-03-30 08:21:57 +00:00
Andreas Terzis
ca9bf3b7ed
Top line should show "Primary data" for users with > 1 plans.
...
When the platform receives data plan information and the
user has more than one data plans, the top line under
Settings -> Network & Internet -> Data Usage should read
"Primary data" instead of "Current data".
Bug: 77295381
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ia9d9d04919c28b163979c70f91eb7d72cdebcb89
2018-03-30 01:09:04 -07:00
Dieter Hsu
1967396c09
Support AOD in the Universal Settings API am: beb89c3545
...
am: a52682fe2b
Change-Id: I1a26d7aef5238ee532bedf24aaf26ff9d2d6d0b8
2018-03-30 08:01:29 +00:00
Dieter Hsu
a52682fe2b
Support AOD in the Universal Settings API
...
am: beb89c3545
Change-Id: Ia651c8ffa20b47671d1eb772bfc09d4a4137bb5d
2018-03-30 07:56:01 +00:00
Yvan Hsueh
2f81209d0f
Retain the selected filter even after the device orientation change.
...
The selected filter should be retained displaying the list even after the device orientation change.
Bug: 36380176
Test: atest packages/apps/Settings/tests/uitests/src/com/android/settings/ui/AppsSettingsRetainFilterTests.java
Change-Id: I7830b525343ce597929771ad4db55a803f893432
2018-03-30 05:29:04 +00:00
Dieter Hsu
beb89c3545
Support AOD in the Universal Settings API
...
Bug: 67997452
Test: make -j RunSettingsRoboTests
Change-Id: I609ac74f70bf040bd9033f421b4bb7c02bf33440
2018-03-30 13:20:56 +08:00
Julia Reynolds
d3c75d8e37
Merge "Update channel DND setting" into pi-dev am: e06a4abb5c
...
am: 98be07d793
Change-Id: Iba9f10aa37541d29fa83c817dd728c588f55f352
2018-03-30 04:16:40 +00:00
Julia Reynolds
98be07d793
Merge "Update channel DND setting" into pi-dev
...
am: e06a4abb5c
Change-Id: If31bb46ded7c9130dcd2d9df988d2163e054e0fe
2018-03-30 04:11:03 +00:00
TreeHugger Robot
e06a4abb5c
Merge "Update channel DND setting" into pi-dev
2018-03-30 04:03:28 +00:00
Fan Zhang
5d97dfab5c
Merge "Remove wrapper for EUICCManager" into pi-dev am: 2cb0425ded
...
am: f97264ce15
Change-Id: I07d3188cbc75e36350bb503d57104907772c48f0
2018-03-30 03:38:17 +00:00
Fan Zhang
de57e7d195
Merge "Register most app info related controllers in xml" into pi-dev am: 4ae4cd5c8d
...
am: a166a70218
Change-Id: Id5bbbd56766fa3daa6f942834accb2708c88b7f9
2018-03-30 03:35:55 +00:00
Fan Zhang
f97264ce15
Merge "Remove wrapper for EUICCManager" into pi-dev
...
am: 2cb0425ded
Change-Id: Ic816024f725d4c32a7b82ae7fbaa2afeaa8b25ef
2018-03-30 03:28:11 +00:00
Fan Zhang
a166a70218
Merge "Register most app info related controllers in xml" into pi-dev
...
am: 4ae4cd5c8d
Change-Id: Ic4dedd363a3dd1ec8ad244d38f9831a0373f7cb2
2018-03-30 03:27:25 +00:00
LexHuang
cb82c2d6db
Support Screen Rotate in the Universal Settings API am: 78df73f00a
...
am: d6209750b4
Change-Id: If605a7eb94e8ded5879dac96eda0f5c1a16b57a3
2018-03-30 03:25:51 +00:00
TreeHugger Robot
2cb0425ded
Merge "Remove wrapper for EUICCManager" into pi-dev
2018-03-30 03:21:37 +00:00
Doris Ling
cb521bdd39
Merge "Increase touch target for suggestion close button." into pi-dev am: d483041078
...
am: 2a9fe0e91d
Change-Id: I6d1ee50345ae45ab48162b017197e1556621fcaa
2018-03-30 03:21:18 +00:00
TreeHugger Robot
4ae4cd5c8d
Merge "Register most app info related controllers in xml" into pi-dev
2018-03-30 03:17:45 +00:00
LexHuang
d6209750b4
Support Screen Rotate in the Universal Settings API
...
am: 78df73f00a
Change-Id: I0e657faf410974170aa6a282c01135e60c60b62e
2018-03-30 02:45:39 +00:00
LexHuang
78df73f00a
Support Screen Rotate in the Universal Settings API
...
Change extend from AbstractPreferenceController to TogglePreferenceControllear
Bug: 67997439
Test: make RunSettingsRoboTests
Change-Id: I86e59d00384fb131f2f2b92186e8536324db2e1b
2018-03-30 02:32:36 +00:00
Fan Zhang
ffb6e93128
Merge changes I0fde4f80,Iea1cff48 into pi-dev am: 0ae4204f54
...
am: 4663e6e52a
Change-Id: I4cff256a0707543d8fd782ba7b3889c5d181ddff
2018-03-30 02:26:45 +00:00
Doris Ling
2a9fe0e91d
Merge "Increase touch target for suggestion close button." into pi-dev
...
am: d483041078
Change-Id: I89697a7b998f29b79d6dc6288d60fcead5908e72
2018-03-30 02:07:07 +00:00
TreeHugger Robot
d483041078
Merge "Increase touch target for suggestion close button." into pi-dev
2018-03-30 01:55:54 +00:00
Fan Zhang
24ebab4565
Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev am: 9af6688a92
...
am: 1b176e3332
Change-Id: I5d15b83e4dce008fea16961e80593180cff45057
2018-03-30 01:42:40 +00:00
Doris Ling
8c62a83811
Merge "Fix visibility issue with fingerprint icon." into pi-dev am: 108c5452b5
...
am: 7acf9a574b
Change-Id: I816c482c1ecdb057b2c8d1d9da86cc3891b486d3
2018-03-30 01:41:56 +00:00
Julia Reynolds
d81633ab96
Merge "Fix 'show badge' for pre O apps" into pi-dev am: d31c655a12
...
am: 11a9d03687
Change-Id: Ib81c3784e158459a06ddc58d373dd0687d9d64c6
2018-03-30 01:41:19 +00:00
Pengquan Meng
6eb14f01bb
Add apn data structure
...
This add a data structure to store the apn data locally.
Test: unit test
Bug: 73745458
Bug: 67327863
Merged-In: Iae56583ab1c99f57154461c71a10b74db87ab1bd
Change-Id: Iae56583ab1c99f57154461c71a10b74db87ab1bd
(cherry picked from commit ee25956f57
)
2018-03-30 01:39:43 +00:00
Jerry Zhang
56dd224609
Merge "Explicity receive sticky usb intent" into pi-dev am: ee283563c8
...
am: 6ebe1935b5
Change-Id: I0010852ae4c714f4c2eda5055e303c761a9194f7
2018-03-30 01:31:16 +00:00
Fan Zhang
b5c651c939
Register most app info related controllers in xml
...
Bug: 77216595
Test: robotests
Change-Id: I79afa38820b7518d8b3112148802797ebcf6d184
2018-03-29 17:55:41 -07:00
Fan Zhang
4663e6e52a
Merge changes I0fde4f80,Iea1cff48 into pi-dev
...
am: 0ae4204f54
Change-Id: I9f27d240ff5f4d2dcf0dbde6733730da294e9f4e
2018-03-30 00:54:21 +00:00
Fan Zhang
1a3ce22645
Remove wrapper for EUICCManager
...
Bug: 76167422
Test: robotests
Change-Id: I2a6687ffab780493fca7b2146cf73cbc7f634081
2018-03-29 17:52:04 -07:00
Fan Zhang
1b176e3332
Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev
...
am: 9af6688a92
Change-Id: Ide6383302dd399a3c6eb1e1011fd88315bda948d
2018-03-29 23:58:03 +00:00
Doris Ling
39cd1d8f0d
Increase touch target for suggestion close button.
...
- wrap the close button icon view in a bigger layout to increase the
overall touch area.
Fixes: 74220173
Test: manual
Change-Id: I45beadf3cfcc6ed1a8a16e6dcb9b8452e1edd78e
2018-03-29 16:56:47 -07:00
Doris Ling
7acf9a574b
Merge "Fix visibility issue with fingerprint icon." into pi-dev
...
am: 108c5452b5
Change-Id: I2ef0e88b9599b2749e43dc1808d1e4c718c98adc
2018-03-29 23:52:26 +00:00
TreeHugger Robot
0ae4204f54
Merge changes I0fde4f80,Iea1cff48 into pi-dev
...
* changes:
Update TimezoneInfoPrefController to register in xml
Make FontSizePreferenceController slice compatible.
2018-03-29 23:49:22 +00:00
Julia Reynolds
11a9d03687
Merge "Fix 'show badge' for pre O apps" into pi-dev
...
am: d31c655a12
Change-Id: Icb08d133cc25653f8429b79d59529f1cce8e93b3
2018-03-29 23:48:17 +00:00
Jerry Zhang
6ebe1935b5
Merge "Explicity receive sticky usb intent" into pi-dev
...
am: ee283563c8
Change-Id: Idcf6eff8617cd3b088e8d58eee9c68e3bb2333de
2018-03-29 23:24:56 +00:00
Pengquan Meng
83afd8a971
Merge "Add apn data structure"
2018-03-29 23:19:11 +00:00
TreeHugger Robot
9af6688a92
Merge "Revert "Support AOD in the Universal Settings API"" into pi-dev
2018-03-29 23:10:45 +00:00
TreeHugger Robot
108c5452b5
Merge "Fix visibility issue with fingerprint icon." into pi-dev
2018-03-29 23:07:24 +00:00
TreeHugger Robot
d31c655a12
Merge "Fix 'show badge' for pre O apps" into pi-dev
2018-03-29 23:06:26 +00:00