Commit Graph

47273 Commits

Author SHA1 Message Date
TreeHugger Robot
e45d89c5bc Merge "Fix typo in the SD Card Formatting screen." 2018-08-16 16:24:58 +00:00
TreeHugger Robot
3613fd07af Merge "Hide SettingsSlice provider" 2018-08-16 15:56:14 +00:00
TreeHugger Robot
119511154e Merge "Add colors to whitelist" 2018-08-16 15:48:56 +00:00
timhypeng
f43a1f185d Remove test-purpose constructor from SavedBluetoothDeviceUpdater
- replace mock object with ShadowBluetoothAdapter

Bug: 111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: Iff69ed511b23846078925609bb603ae414956ea3
2018-08-16 01:25:01 +00:00
timhypeng
47a6dbcd94 Remove test-purpose constructor from AvailableMediaBluetoothDeviceUpdater
- replace mock object with ShadowCachedBluetoothDeviceManager to test CachedBluetoothDevice
- rename cachedDevices to mCachedDevices

Bug: 111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: I3028a6fe06c39c48e7cee33976bdfcab2c8b73c8
2018-08-16 01:24:52 +00:00
timhypeng
273c6d3918 Remove test-purpose constructor from ConnectedBluetoothDeviceUpdater
- replace mock object with ShadowCachedBluetoothDeviceManager to test CachedBluetoothDevice
- rename cachedDevices to mCachedDevices

Bug: 111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib024a3e9c3af745b1ab0be36361165a547cfa756
2018-08-16 01:24:40 +00:00
Jordan Liu
1aabc2cc4e Merge "Refresh subscription info when subid changes" am: 5226ac6110 am: 114cacf2a8
am: 611d824110

Change-Id: I29492ef016c8ca9836ecf28c787e441629cfecb0
2018-08-15 18:23:10 -07:00
Jordan Liu
611d824110 Merge "Refresh subscription info when subid changes" am: 5226ac6110
am: 114cacf2a8

Change-Id: If8e2d3a2045b7db65856673a7aed5192d7ff4bc9
2018-08-15 17:06:22 -07:00
Kevin Chyn
520befff01 Add colors to whitelist
export ANDROID_LINT_JARS=$(gettop)/prebuilts/checkcolor/checkcolor.jar
lint --check HardCodedColor --xml color-check-baseline.xml .

Bug: 112005540

Test: builds
Change-Id: Ibac23dda42e797fc01141cbe85d232ba5ea63139
2018-08-15 17:04:42 -07:00
Jordan Liu
114cacf2a8 Merge "Refresh subscription info when subid changes"
am: 5226ac6110

Change-Id: I874fb7e8f3d3146cb614de3ee088e93c1863a592
2018-08-15 16:29:14 -07:00
Bill Yi
e34c5853e9 Fix typo in the SD Card Formatting screen.
credit: cl/208558166

TEST:none
Change-Id: I15e2f396ad1e1dd2364c9a2d38e3a34203e121ba
2018-08-15 23:06:50 +00:00
TreeHugger Robot
ac03e735df Merge "Implement createPrefControllers for tether page" 2018-08-15 22:21:18 +00:00
Matthew Fritze
e8d66bb783 Hide SettingsSlice provider
Explicitly set the Settings SliceBroadcastReceiver to
be non-exported and remove the intent-filter.

Add a second provider: SliceRelayReceiver to receive
broadcasts from SysUI to alert Settings to potential
changes to bound Settings Slices. The new receiver is
exported, but only notifies changes to Settings, and
doesn't make any changes itself.

Change-Id: I80d070f7636614135ebe4f57a16f12a3eb6dee81
Fixes: 111330641
Test: boot, robolectric, Slicebrowser
2018-08-15 15:17:02 -07:00
Jordan Liu
5226ac6110 Merge "Refresh subscription info when subid changes" 2018-08-15 21:48:01 +00:00
TreeHugger Robot
537d6f29f1 Merge "Disable bg restriction for "Disallow apps control"" 2018-08-15 21:15:06 +00:00
jackqdyulei
f5aa59e99e Implement createPrefControllers for tether page
So tether preferences could show up in search

Change-Id: I234680aff878451df2a634cb58538bb2627d2eff
Fixes: 112599941
Test: Robotests
2018-08-15 13:15:04 -07:00
Jordan Liu
b1facd2001 Refresh subscription info when subid changes
We store the initial subId and check if it has changed so that we always
have the updated subscription info in fillList().

Fixes: 111731641
Test: manually verify that swapping the SIM loads new APNs
Change-Id: I3475915f2c380fb67b2e56436423d491e489d91e
2018-08-15 11:37:24 -07:00
TreeHugger Robot
097cfa7251 Merge "Migrate all remaining condition cards to v2." 2018-08-15 18:02:35 +00:00
Fan Zhang
7373ec042b Migrate all remaining condition cards to v2.
Bug: 112485407
Test: robotests
Change-Id: I3c304c308fa6f499b4b5e21d4c5735cde7b90220
2018-08-15 09:48:38 -07:00
Jordan Liu
0f54511eb8 [automerger skipped] Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" am: 5b7535d5b4 am: b951ba66e5
am: 63910710ef  -s ours

Change-Id: I577cb63948f594e0505ce9c19bb3cd1e9c4613f7
2018-08-15 04:54:56 -07:00
Jordan Liu
63910710ef Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" am: 5b7535d5b4
am: b951ba66e5

Change-Id: I15b5f716f97efe9ba54a5dee25f2e0cbb33fecff
2018-08-15 00:44:42 -07:00
Kevin Chyn
af643d3690 Merge "7/n: Add enrollment animation" 2018-08-15 06:34:41 +00:00
Kevin Chyn
e9117d9b95 7/n: Add enrollment animation
Fixes: 112005540

Test: Tested with ag/4749121

Change-Id: I7d51187f7b8b7a6c2c34c984740b76bc9fd89262
2018-08-14 22:22:53 -07:00
Jordan Liu
b951ba66e5 Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
am: 5b7535d5b4

Change-Id: I7b1f6e53c521c0f17d17199de2f185eb64fd3c59
2018-08-14 20:09:31 -07:00
Jordan Liu
5b7535d5b4 Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" 2018-08-14 23:54:12 +00:00
Xiangyu/Malcolm Chen
5d4bedb7d2 [automerger skipped] Merge "Use new SubscriptionInfo constructor" am: e8e24e7e0b am: 188272e12b
am: d78a882bb1  -s ours

Change-Id: Idffe865742097d74f4d5373a41c5c2cf240f0032
2018-08-14 16:25:53 -07:00
jackqdyulei
fd0c472bdc Disable bg restriction for "Disallow apps control"
Use RestrictedPreference so it could handle it automatically

Change-Id: Ibf58934639677b88316366b2e00790f9556d0966
Fixes: 64474641
Test: Robotests
2018-08-14 15:56:51 -07:00
irisykyang
40f4f799bb Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED
Bug: 77250264
Test: Manual testing
Change-Id: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Merged-In: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
2018-08-14 15:55:43 -07:00
Xiangyu/Malcolm Chen
d78a882bb1 Merge "Use new SubscriptionInfo constructor" am: e8e24e7e0b
am: 188272e12b

Change-Id: I3bd584dd5e8258713bd101e488ffefea81ad0a48
2018-08-14 15:06:16 -07:00
Xiangyu/Malcolm Chen
188272e12b Merge "Use new SubscriptionInfo constructor"
am: e8e24e7e0b

Change-Id: I1e51d7951cc3594685c9dd2e0b4c0e2aedb3e84f
2018-08-14 13:59:07 -07:00
TreeHugger Robot
3adbe90783 Merge "New ConditionManager" 2018-08-14 19:43:37 +00:00
Xiangyu/Malcolm Chen
e8e24e7e0b Merge "Use new SubscriptionInfo constructor" 2018-08-14 18:58:25 +00:00
Fan Zhang
5f116cedd3 Reformat wifisettings fragment.
Bug: 111875856
Test: rebuild
Change-Id: I9f8d5aaab0dc5015416084aac273c4f01e52a4ed
2018-08-14 11:16:31 -07:00
Fan Zhang
06e25e75a5 New ConditionManager
- Create a new ConditionManager that loads data and filters displayable
  condtionals in memory
- Separete conditional controller logic and ui model
- Plumb new ui model into DashboardAdapater, and create a new
  ConditionAdapter to manage UI.

Bug: 112485407
Test: robotests
Change-Id: If56d141d135341e9b8c2dc80e43c3d40b1de1340
2018-08-14 11:01:49 -07:00
Malcolm Chen
b9a6c65a65 Use new SubscriptionInfo constructor
Bug: 92796390
Test: build
Change-Id: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Merged-In: I5a90831b0050a0a201fce5b8f824fcb4c983a722
2018-08-13 20:26:38 -07:00
TreeHugger Robot
295ba527a7 Merge "Save BottomSheet state when screen rotate" 2018-08-14 03:06:26 +00:00
Kevin Chyn
2405ab5a15 Merge "Stop camera enumeration after finding first camera" 2018-08-14 02:57:56 +00:00
Android Build Merger (Role)
61284353eb Merge "Merge stage-dr1-aosp-master into stage-aosp-master am: fbc7d27155 am: 55ce535126" 2018-08-14 02:08:05 +00:00
Raff Tsai
11b17a7e11 Save BottomSheet state when screen rotate
- Save BottomSheet state in onSaveInstanceState
- When Settings starts from saved state, we don't need to
  add fragment. Because FragmentManager already contains
  fragment instance.
- Fix status bar color

Change-Id: Ic8779b8253040554409e735bd57bd9001c1d56fd
Fixes: 112428378
Test: make RunSettingsRoboTests
2018-08-14 09:56:27 +08:00
TreeHugger Robot
8bcd81e742 Merge "Move ConditionListener to a top level class." 2018-08-14 01:54:27 +00:00
Xin Li
bec33b1463 Merge stage-dr1-aosp-master into stage-aosp-master am: fbc7d27155
am: 55ce535126

Change-Id: I8a5b2cefa1e2845dc621a1d94816741966070f33
2018-08-13 18:43:50 -07:00
Kevin Chyn
6ec727914f Stop camera enumeration after finding first camera
The first one returned generally specifies the vendor's recommended
camera. We can also check lens focal length but it's not necessary.

Fixes: 112482387

Test: manual
Change-Id: Iab245f278ce1bf69ea95f7c081d20e837e84fe51
2018-08-13 18:33:24 -07:00
Xin Li
55ce535126 Merge stage-dr1-aosp-master into stage-aosp-master
am: fbc7d27155

Change-Id: I02a6acca4f15b665cf5b5f3f19d1df07b65264cb
2018-08-13 17:36:58 -07:00
Fan Zhang
48ef7e5b6f Move ConditionListener to a top level class.
So we can use it later for furture refactoring.

Bug: 112485407
Test: rebuild
Change-Id: Ic3994464cfaff67a56f2d383490860a81f436fbd
2018-08-13 17:31:08 -07:00
Lei Yu
e97d8189c9 Merge "Refactor the BatteryInfo" 2018-08-14 00:05:01 +00:00
Xin Li
fbc7d27155 Merge stage-dr1-aosp-master into stage-aosp-master
Bug: 112535855
Change-Id: Ifd79dc537052cc78e7f5451316d637b24c9830ca
2018-08-13 13:01:18 -07:00
TreeHugger Robot
5aa8e3c661 Merge "Remove SettingsAppWidgetProvider and related resources" 2018-08-13 15:57:23 +00:00
TreeHugger Robot
03b578f557 Merge "Always enable double tap and pick up gestures" 2018-08-13 15:04:01 +00:00
Mill Chen
1005e76690 Remove SettingsAppWidgetProvider and related resources
Bug: 111514449
Test: manual, RunSettingsRoboTests
Change-Id: I91e5662148a00a2aed12341304007f3b155e181c
2018-08-13 22:38:10 +08:00
TreeHugger Robot
237f80b0aa Merge "Force externally injected tiles to use rounded icon." 2018-08-11 01:20:22 +00:00