Commit Graph

5207 Commits

Author SHA1 Message Date
Lei Yu
4e5ec9a9c1 Merge "Remove the obsolete bluetooth code" into pi-dev am: fa150fca3c
am: a5a338dff6

Change-Id: Icbc382b54b4bfe329aa8f2045433885997badf05
2018-03-31 03:35:30 +00:00
Fan Zhang
62b5000647 Merge "Remove networkScorer wrapper" into pi-dev am: 272d3b5096
am: 0cad854925

Change-Id: Ieb6bf1eed2e0877d5223bb45036af42ed6ebd791
2018-03-31 03:34:46 +00:00
Lei Yu
1ad1a29d88 Merge "Update the battery saver summary" into pi-dev am: 97dd3c9aac
am: 5b8c6c39e9

Change-Id: I6584692ea03b6f1c8bea8ceda4693d48d057e9e1
2018-03-31 03:34:11 +00:00
Lei Yu
f1e1fe26e1 Merge "Refine the update process of battery tip" into pi-dev am: 227f056c8b
am: 5072234808

Change-Id: I92a29efd4c58a002c23a5d97f3cba5a581a44212
2018-03-31 02:04:46 +00:00
Lei Yu
824bd92a16 Merge "Update battery strings" into pi-dev am: 7bbc11e87d
am: ab4ebab76c

Change-Id: Ic7bd7ff889bf921cdf3123d5df7a73795f3b734a
2018-03-31 00:21:58 +00:00
Victor Chang
34e0883317 Merge "Remove dead code in time zone picker" into pi-dev am: 93b5d0d3f0
am: 78d61aff2d

Change-Id: I567b56244cee9c72fe6bf17b0a2db4c14d4d244e
2018-03-30 21:40:51 +00:00
Jyun LuoLai
56d3c705ee Merge "Modify AddDevicePreferenceController's constructor" into pi-dev am: 11174d3ced
am: b02f7f71a5

Change-Id: Idba6e2791e87b58293e47583884d2eaded02f0a0
2018-03-30 21:30:44 +00:00
Lei Yu
fa150fca3c Merge "Remove the obsolete bluetooth code" into pi-dev 2018-03-30 20:24:01 +00:00
TreeHugger Robot
272d3b5096 Merge "Remove networkScorer wrapper" into pi-dev 2018-03-30 20:16:06 +00:00
Lei Yu
97dd3c9aac Merge "Update the battery saver summary" into pi-dev 2018-03-30 20:01:50 +00:00
Lei Yu
227f056c8b Merge "Refine the update process of battery tip" into pi-dev 2018-03-30 19:56:46 +00:00
Lei Yu
7bbc11e87d Merge "Update battery strings" into pi-dev 2018-03-30 19:12:41 +00:00
Victor Chang
93b5d0d3f0 Merge "Remove dead code in time zone picker" into pi-dev 2018-03-30 18:35:52 +00:00
Lei Yu
dec7a719d1 Remove the obsolete bluetooth code
Also update the shortcut:
1. Change the name to "Devices"
2. Change it point to "Connected device" page

Bug: 74806595
Fixes: 69926683
Test: robo test still pass

Change-Id: Ic57756fc955dc622cc22d0be64f02b5ae07a2915
2018-03-30 11:24:26 -07: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
Fan Zhang
368c81e97b Remove networkScorer wrapper
Also modified NetworkScorerPickerPreferenceController to register itself
in xml directily

Bug: 76167422
Test: robotests
Change-Id: I4a216b5e6845aecd6aaeed0ed9b3e06c9e0fc590
2018-03-30 11:06:30 -07:00
TreeHugger Robot
11174d3ced Merge "Modify AddDevicePreferenceController's constructor" into pi-dev 2018-03-30 17:23:51 +00:00
Pengquan Meng
dbf8a678ae Merge "Add apn data structure" into pi-dev 2018-03-30 17:00:35 +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
TreeHugger Robot
efa1cde042 Merge "Dnd 'blink light' option only if phone has LED" into pi-dev 2018-03-30 13:16:25 +00: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
Jyun LuoLai
e44b94c435 Modify AddDevicePreferenceController's constructor
For xml type controller, implements the constructor (Context, String)
would be better

Bug: 73960246
Test: Manual test & make RunSettingsRoboTests
Change-Id: I872a663947f14de5e83c596655b2ffb75f37f057
2018-03-30 14:00:03 +08: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
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
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
TreeHugger Robot
4ae4cd5c8d Merge "Register most app info related controllers in xml" into pi-dev 2018-03-30 03:17:45 +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
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
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
Lei Yu
0ae2cd68f2 Refine the update process of battery tip
1. When device is rotated, don't update the battery tip
2. When user go back to battery main page from other page, start
battery tip update process
3. In RestrictAppTip, if there aren't restricted apps anymore,
hide the tip.

Bug: 74467010
Test: RunSettingsRobotests

Change-Id: I300bcc5b487d587f6618e340ac074fe416dcc1b2
2018-03-29 17:59:58 -07: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
1a3ce22645 Remove wrapper for EUICCManager
Bug: 76167422
Test: robotests
Change-Id: I2a6687ffab780493fca7b2146cf73cbc7f634081
2018-03-29 17:52:04 -07: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
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
d31c655a12 Merge "Fix 'show badge' for pre O apps" into pi-dev 2018-03-29 23:06:26 +00:00
Beverly
ad3e422916 Dnd 'blink light' option only if phone has LED
Change-Id: Ifbc75128a9434f83839cd6b60405a03f88f4b3d3
Fixes: 77271775
Test: make ROBOTEST_FILTER=ZenModeVisEffectPreferenceControllerTest RunSettingsRoboTests -j40
2018-03-29 19:00:41 -04:00
Fan Zhang
65983f71d5 Update TimezoneInfoPrefController to register in xml
Test: robotest
Bug: 77216595
Change-Id: I0fde4f8058a8be156dddb620a756254cd85f6a9f
2018-03-29 14:38:44 -07:00
Pengquan Meng
ee25956f57 Add apn data structure
This add a data structure to store the apn data locally.

Test: no test
Bug: 73745458
Bug: 67327863
Change-Id: Iae56583ab1c99f57154461c71a10b74db87ab1bd
2018-03-29 14:23:09 -07:00
Victor Chang
a7d9133461 Merge "Fix ZonePickerSettingsTest due to string change" into pi-dev am: 75f438cc37
am: 8995e8d9f6

Change-Id: I84aefcb56804a50693cbd44d776fecad28c550f6
2018-03-29 21:22:10 +00:00
Julia Reynolds
cb78269637 Update channel DND setting
... to reflect DND changes elsewhere in the system. Update the summary
and make the setting always available.

Test: make -j RunSettingsRoboTests
Change-Id: Ia51c349d863e1470e8a043293fa60f22632fa2df
Fixes: 76137346
2018-03-29 20:55:03 +00:00
Doris Ling
c925c8d534 Merge "Report unavailable data usage." into pi-dev am: a673f714c4
am: 4395decf14

Change-Id: I713f1fc8a1025087b8dfc775e45c63c0ff037c9c
2018-03-29 20:45:42 +00:00