OSDN Git Service
Adrian Roos [Tue, 21 Aug 2018 19:53:56 +0000 (19:53 +0000)]
Merge "Cutout emulation: string changes and ordering"
TreeHugger Robot [Tue, 21 Aug 2018 19:14:59 +0000 (19:14 +0000)]
Merge "Use title in ManagedServiceSetting dialogs"
TreeHugger Robot [Tue, 21 Aug 2018 19:01:31 +0000 (19:01 +0000)]
Merge changes from topics "remove_tile_summary_cache", "remove_tile_title"
* changes:
Use getSummary() to get tile summary text.
Use tile.getTitle(context) to get tile title.
Adrian Roos [Tue, 21 Aug 2018 16:26:29 +0000 (18:26 +0200)]
Cutout emulation: string changes and ordering
Updates strings according to spec. Also ensures
that the emulation overlays are shown in the
order of their priority.
Bug:
112876936
Test: Open developer options, go to "display cutout", verify strings.
Change-Id: If2d05595d02a277896202ab2a6262c99508a3a17
Beverly [Tue, 21 Aug 2018 15:35:54 +0000 (11:35 -0400)]
Use title in ManagedServiceSetting dialogs
- Use the title (not summary) of the preference in its warning dialogs
Test: manual
Bug:
112687996
Change-Id: Ia217e5252cf7a48450da853c0270093ffb57dca7
Fan Zhang [Tue, 21 Aug 2018 16:19:12 +0000 (16:19 +0000)]
Merge "Use searchable="false" to suppress nonIndexables."
Julia Reynolds [Tue, 21 Aug 2018 14:39:07 +0000 (10:39 -0400)]
Fix notifications crash
Change-Id: I75a34beb124de92c0d7d9033e3fe21dbdeb67ed3
Fixes:
112656503
Test: manual
TreeHugger Robot [Tue, 21 Aug 2018 00:49:31 +0000 (00:49 +0000)]
Merge "Add RecyclerView for contextual settings homepage."
TreeHugger Robot [Tue, 21 Aug 2018 00:21:07 +0000 (00:21 +0000)]
Merge "Refactor add network page"
Emily Chuang [Mon, 20 Aug 2018 23:17:05 +0000 (07:17 +0800)]
Add RecyclerView for contextual settings homepage.
Bug:
111676964
Test: robotests
Change-Id: I36002a9085ca12ef027726c5a600ba833dd4f47e
Fan Zhang [Mon, 20 Aug 2018 21:13:14 +0000 (14:13 -0700)]
Use getSummary() to get tile summary text.
Bug:
77600770
Test: robotests
Change-Id: Iecef09853bb49bc259502494912ed81d52e2d7ce
Fan Zhang [Fri, 17 Aug 2018 18:36:20 +0000 (11:36 -0700)]
Use tile.getTitle(context) to get tile title.
And switch to getId() instead of title when comparing 2 tiles. This is
more accurate and more efficient.
Bug:
77600770
Test: robotests
Change-Id: I587d90702d98956bf7b420529ac3280351ca4a10
TreeHugger Robot [Mon, 20 Aug 2018 18:02:35 +0000 (18:02 +0000)]
Merge "Update the method name from isA2dpDevice() to isConnectedA2dpDevice()"
TreeHugger Robot [Mon, 20 Aug 2018 17:53:24 +0000 (17:53 +0000)]
Merge "Update the method name from isHfpDevice() to isConnectedHfpDevice()"
TreeHugger Robot [Mon, 20 Aug 2018 16:39:30 +0000 (16:39 +0000)]
Merge "Don't offer "None" lock type for work profiles."
TreeHugger Robot [Mon, 20 Aug 2018 16:19:57 +0000 (16:19 +0000)]
Merge "Refactor WifiSlice to CustomSliceManager"
Matthew Fritze [Fri, 20 Jul 2018 16:41:40 +0000 (09:41 -0700)]
Refactor WifiSlice to CustomSliceManager
Modify the WifiSliceCode to follow the pattern for
Slices that do not match existing UI components.
Test: robotests
Bug:
80263568
Change-Id: Id69e019608777282f4b64ff945e8c30c97aaf577
timhypeng [Mon, 20 Aug 2018 08:03:02 +0000 (16:03 +0800)]
Update the method name from isHfpDevice() to isConnectedHfpDevice()
Bug:
110072747
Test: make -j50 RunSettingsRoboTests
Change-Id: I4f42a4d55a107c870c76761434f4e5999ac76904
timhypeng [Mon, 20 Aug 2018 07:53:37 +0000 (15:53 +0800)]
Update the method name from isA2dpDevice() to isConnectedA2dpDevice()
Bug:
110072747
Test: make -j50 RunSettingsRoboTests
Change-Id: Id3ceb3a62b888a2bde82a1372edf26454e525ea1
Pavel Grafov [Wed, 15 Aug 2018 20:07:01 +0000 (21:07 +0100)]
Don't offer "None" lock type for work profiles.
"None" doesn't make sense for work profiles because it makes
profile insecure even if primary user is secure. If the user
wants to get rid of separate challenge, it will be offered in
previous Settings page, "Use one lock", so this shouldn't cause
any confusion.
Test: atest tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
Test: manual, tried setting personal an work challenges from Settings and via Intent.
Bug:
33656033
Change-Id: I830b3e372c1fe200fc4e02d59e3c3805bac5f9bb
Hemant Gupta [Fri, 17 Aug 2018 20:41:13 +0000 (13:41 -0700)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am:
84bb2293ae am:
ff985c6bc7
am:
0c75671a5f
Change-Id: Icc7d90a0e440d3d8f462d61821c602b26f79dbb7
Hemant Gupta [Fri, 17 Aug 2018 19:57:33 +0000 (12:57 -0700)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing" am:
84bb2293ae
am:
ff985c6bc7
Change-Id: I9c2c99a0f3999c550195b4ed7eed5a31caea9d2a
TreeHugger Robot [Fri, 17 Aug 2018 19:15:23 +0000 (19:15 +0000)]
Merge "Fix indexing after slices api changes"
Hemant Gupta [Fri, 17 Aug 2018 19:11:27 +0000 (12:11 -0700)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
am:
84bb2293ae
Change-Id: Ief10c8b5b3cdae90ba37a6349528f85e59562dc9
Fan Zhang [Fri, 17 Aug 2018 18:55:38 +0000 (11:55 -0700)]
[automerger skipped] Merge "Fix memory leaks in Settings" into pi-dev am:
be13e74deb
am:
6136194c4d -s ours
Change-Id: I5499ae3769b11cc22b68f4c1033fcff9d82b21cb
Fan Zhang [Fri, 17 Aug 2018 18:34:53 +0000 (11:34 -0700)]
Merge "Fix memory leaks in Settings" into pi-dev
am:
be13e74deb
Change-Id: I51e9c6682a0589afbdfcc8799b10598eac496396
Treehugger Robot [Fri, 17 Aug 2018 18:05:21 +0000 (18:05 +0000)]
Merge "Bluetooth: PBAP not disconnected on disabling contact sharing"
TreeHugger Robot [Fri, 17 Aug 2018 18:04:44 +0000 (18:04 +0000)]
Merge "Fix memory leaks in Settings" into pi-dev
Fan Zhang [Wed, 15 Aug 2018 19:55:56 +0000 (12:55 -0700)]
Use searchable="false" to suppress nonIndexables.
When possible, remove or simplify getNonIndexable() logic in fragments,
and use searchable="false" in xml to suppress index.
Change-Id: I5bdf5bc7d5494a64cdd9e230a51321a4b210af69
Fixes:
112608186
Test: robotest and manual search
tmfang [Thu, 9 Aug 2018 16:25:47 +0000 (00:25 +0800)]
Refactor add network page
WifiDialog.java can be launched as "full screen mode"
in some use cases. However the way it's done is that
it uses theme to fake the full screen appearance.
It just feels hacky to use a dialog for full screen UI.
So, we created an "AddNetworkFragment" to make this
page can look like a normal fragment.
Also, clean up some useless code about "full screen mode"
of WifiDialog.
Change-Id: Iedd04c6a8e403cbceb872313314e1cba0d514246
Fixes:
111875856
Test: robo test, manual test
TreeHugger Robot [Fri, 17 Aug 2018 15:35:20 +0000 (15:35 +0000)]
Merge changes Idb448ea3,I7dc26369
* changes:
Fix crash on "Set up Wi-Fi NFC tag" dialog
Fix bug about Wi-Fi dialog rotation
TreeHugger Robot [Fri, 17 Aug 2018 08:51:17 +0000 (08:51 +0000)]
Merge "Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()"
tmfang [Fri, 17 Aug 2018 07:16:12 +0000 (15:16 +0800)]
Fix crash on "Set up Wi-Fi NFC tag" dialog
When user launches "Set up Wi-Fi NFC tag" dialog
and then tries to rotate screen, device will
crash.
Because isShowing() of dialog won't return true
anymore when fragment calls onSaveIntance(),
we can't save status of dialog successfully.
And then, when fragment called onCreateDialog()
again, it can't get any dialog object.
So, we only check dialog whether is null or not.
If dialog is null, it means that there is no dialog
was shown before user rotates the screen.
Fixes:
112741721
Test: NFC tag wifi test, robo test
Change-Id: Idb448ea32c4215d8380c69bfd896cc91d8c1f8d1
tmfang [Thu, 16 Aug 2018 06:20:29 +0000 (14:20 +0800)]
Fix bug about Wi-Fi dialog rotation
When user clicks a Wi-Fi access point in WifiSettings,
screen pops up a Wi-Fi point dialog. And then user
rotates the screen, Wi-Fi access dialog changes to
"Add network" full screen dialog.
In old code, we check whether dialog is showing by
dialog.isShowing() in onSaveInstanceState.
For now, this design is not appropriate. Since isShowing()
won't return true anymore when fragment calls onSaveInstanceState.
So, we check dialog object whether is null or not now.
If dialog is null, it means that there is no dialog was shown,
before user rotates the screen.
Change-Id: I7dc26369c005f576fe679abc70327f6a02620935
Fixes:
112624846
Test: manual test, robo test
ChenChen Chen [Fri, 17 Aug 2018 03:46:02 +0000 (20:46 -0700)]
Merge "Always show items in options menu for Wi-Fi Direct settings" am:
1e160cc8bf am:
0173130d73
am:
c31869a940
Change-Id: I545d38612f05c35949d37037c0744a57bcf8164f
ChenChen Chen [Fri, 17 Aug 2018 03:29:49 +0000 (20:29 -0700)]
Merge "Always show items in options menu for Wi-Fi Direct settings" am:
1e160cc8bf
am:
0173130d73
Change-Id: I7e70b3f2140301673b45beb3fb7ad7ed2d848a1d
Matthew Fritze [Fri, 17 Aug 2018 03:07:46 +0000 (20:07 -0700)]
[automerger skipped] Merge "Hide SettingsSlice provider" into pi-dev am:
041bfbd2b6
am:
e48cf70a96 -s ours
Change-Id: Ibac67440b71883a94d9e008d2cbf395c5b9a2a2e
ChenChen Chen [Fri, 17 Aug 2018 00:39:00 +0000 (17:39 -0700)]
Merge "Always show items in options menu for Wi-Fi Direct settings"
am:
1e160cc8bf
Change-Id: Ie1edf750d2f205be97b07c84429e2c1468aa6c58
Matthew Fritze [Fri, 17 Aug 2018 00:33:01 +0000 (17:33 -0700)]
Merge "Hide SettingsSlice provider" into pi-dev
am:
041bfbd2b6
Change-Id: I9e9f0cfc71a6352f7adfa3072a097dd126f38a29
TreeHugger Robot [Thu, 16 Aug 2018 21:45:53 +0000 (21:45 +0000)]
Merge "Add 'Reach to check' to lock screen settings"
TreeHugger Robot [Thu, 16 Aug 2018 21:23:17 +0000 (21:23 +0000)]
Merge "Hide SettingsSlice provider" into pi-dev
TreeHugger Robot [Thu, 16 Aug 2018 20:53:30 +0000 (20:53 +0000)]
Merge "Refined the StrictMode for CardContentProvider"
TreeHugger Robot [Thu, 16 Aug 2018 20:18:20 +0000 (20:18 +0000)]
Merge "Check condition displayable state in parallel."
TreeHugger Robot [Thu, 16 Aug 2018 19:56:37 +0000 (19:56 +0000)]
Merge "Launch work profile activity to add Autofill service"
Fan Zhang [Thu, 16 Aug 2018 19:13:30 +0000 (12:13 -0700)]
Refined the StrictMode for CardContentProvider
- Modify CardContentProvider and add Mainthread checking
Bug:
111820446
Test: robotest
Change-Id: I7af25e8938b79c4c0fe225d58d59da4dde15ba45
Fan Zhang [Thu, 16 Aug 2018 17:41:08 +0000 (10:41 -0700)]
Check condition displayable state in parallel.
This speeds up condition display by about 40 ms.
Bug:
112485407
Test: robotests still passes
Change-Id: Iac66354492496a9ece9178c438db6506e6fe7be5
Zimuzo [Wed, 15 Aug 2018 14:10:20 +0000 (15:10 +0100)]
Launch work profile activity to add Autofill service
ag/
4666330 allowed choosing separate Autofill services for the main and work profile. However, the 'Add service' button for work profile always resolved action_view intent as the main user even when clicking the work profile preference. Now the intent is resolved to the right profile depending on the preference clicked.
BUG:
112610177
Test: Verified manually
Change-Id: I870346d7b5618e7c230edebd59ac7f52f8495d47
TreeHugger Robot [Thu, 16 Aug 2018 17:20:37 +0000 (17:20 +0000)]
Merge "Declare "searchable" attribute for preferences."
Treehugger Robot [Thu, 16 Aug 2018 17:15:40 +0000 (17:15 +0000)]
Merge "Always show items in options menu for Wi-Fi Direct settings"
TreeHugger Robot [Thu, 16 Aug 2018 16:24:58 +0000 (16:24 +0000)]
Merge "Fix typo in the SD Card Formatting screen."
Fan Zhang [Tue, 14 Aug 2018 23:25:54 +0000 (16:25 -0700)]
Declare "searchable" attribute for preferences.
Now we can easily mark a preference nonIndexable in xml instead of
adding key into searchIndexProvider.
Bug:
112608186
Test: robotests
Change-Id: I0ff16d44bb7b6ad148d3d35f09ca0da0163f73f4
TreeHugger Robot [Thu, 16 Aug 2018 15:56:14 +0000 (15:56 +0000)]
Merge "Hide SettingsSlice provider"
TreeHugger Robot [Thu, 16 Aug 2018 15:48:56 +0000 (15:48 +0000)]
Merge "Add colors to whitelist"
ChenChen Chen [Tue, 14 Aug 2018 06:27:25 +0000 (14:27 +0800)]
Always show items in options menu for Wi-Fi Direct settings
Remove MenuItem.SHOW_AS_ACTION_IF_ROOM flag for menu items
to avoid showing truncated texts on action bar.
Bug:
112671955
Test: Manual
Change-Id: I1c9678321442169bc86d719e820d4af68261dee1
timhypeng [Tue, 14 Aug 2018 10:45:18 +0000 (18:45 +0800)]
Remove test-purpose constructor from SavedBluetoothDeviceUpdater
- replace mock object with ShadowBluetoothAdapter
Bug:
111848213
Test: make -j50 RunSettingsRoboTests
Change-Id: Iff69ed511b23846078925609bb603ae414956ea3
timhypeng [Tue, 14 Aug 2018 02:30:50 +0000 (10:30 +0800)]
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
timhypeng [Mon, 13 Aug 2018 09:38:36 +0000 (17:38 +0800)]
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
Jordan Liu [Thu, 16 Aug 2018 01:23:10 +0000 (18:23 -0700)]
Merge "Refresh subscription info when subid changes" am:
5226ac6110 am:
114cacf2a8
am:
611d824110
Change-Id: I29492ef016c8ca9836ecf28c787e441629cfecb0
Jordan Liu [Thu, 16 Aug 2018 00:06:22 +0000 (17:06 -0700)]
Merge "Refresh subscription info when subid changes" am:
5226ac6110
am:
114cacf2a8
Change-Id: If8e2d3a2045b7db65856673a7aed5192d7ff4bc9
Kevin Chyn [Thu, 16 Aug 2018 00:02:11 +0000 (17:02 -0700)]
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
Jordan Liu [Wed, 15 Aug 2018 23:29:14 +0000 (16:29 -0700)]
Merge "Refresh subscription info when subid changes"
am:
5226ac6110
Change-Id: I874fb7e8f3d3146cb614de3ee088e93c1863a592
Bill Yi [Tue, 14 Aug 2018 22:00:13 +0000 (15:00 -0700)]
Fix typo in the SD Card Formatting screen.
credit: cl/
208558166
TEST:none
Change-Id: I15e2f396ad1e1dd2364c9a2d38e3a34203e121ba
Mady Mellor [Wed, 15 Aug 2018 22:11:51 +0000 (15:11 -0700)]
Fix indexing after slices api changes
Test: make -j40 RunSettingsGoogleRoboTests
make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Slice"
Change-Id: Ib599a8c814942a80d7b60fc3b40b284ce2b55775
TreeHugger Robot [Wed, 15 Aug 2018 22:21:18 +0000 (22:21 +0000)]
Merge "Implement createPrefControllers for tether page"
Matthew Fritze [Mon, 30 Jul 2018 21:12:50 +0000 (14:12 -0700)]
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
Matthew Fritze [Mon, 30 Jul 2018 21:12:50 +0000 (14:12 -0700)]
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: I422c0b07a61efa8996e9fdfa398eee84bbc1796f
Merged-In: I80d070f7636614135ebe4f57a16f12a3eb6dee81
Fixes:
111330641
Test: boot, robolectric, Slicebrowser
Jordan Liu [Wed, 15 Aug 2018 21:48:01 +0000 (21:48 +0000)]
Merge "Refresh subscription info when subid changes"
TreeHugger Robot [Wed, 15 Aug 2018 21:15:06 +0000 (21:15 +0000)]
Merge "Disable bg restriction for "Disallow apps control""
jackqdyulei [Wed, 15 Aug 2018 00:58:44 +0000 (17:58 -0700)]
Implement createPrefControllers for tether page
So tether preferences could show up in search
Change-Id: I234680aff878451df2a634cb58538bb2627d2eff
Fixes:
112599941
Test: Robotests
Jordan Liu [Tue, 14 Aug 2018 23:52:07 +0000 (16:52 -0700)]
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
TreeHugger Robot [Wed, 15 Aug 2018 18:02:35 +0000 (18:02 +0000)]
Merge "Migrate all remaining condition cards to v2."
Fan Zhang [Tue, 14 Aug 2018 20:25:47 +0000 (13:25 -0700)]
Migrate all remaining condition cards to v2.
Bug:
112485407
Test: robotests
Change-Id: I3c304c308fa6f499b4b5e21d4c5735cde7b90220
Jordan Liu [Wed, 15 Aug 2018 11:54:56 +0000 (04:54 -0700)]
[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
Jordan Liu [Wed, 15 Aug 2018 07:44:42 +0000 (00:44 -0700)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" am:
5b7535d5b4
am:
b951ba66e5
Change-Id: I15b5f716f97efe9ba54a5dee25f2e0cbb33fecff
Kevin Chyn [Wed, 15 Aug 2018 06:34:41 +0000 (06:34 +0000)]
Merge "7/n: Add enrollment animation"
Kevin Chyn [Thu, 9 Aug 2018 23:31:09 +0000 (16:31 -0700)]
7/n: Add enrollment animation
Fixes:
112005540
Test: Tested with ag/
4749121
Change-Id: I7d51187f7b8b7a6c2c34c984740b76bc9fd89262
timhypeng [Tue, 31 Jul 2018 07:15:10 +0000 (15:15 +0800)]
Remove LocalBluetoothAdapter from CachedBluetoothDeviceManager::addDevice()
Bug:
111815935
Test: make -j50 RunSettingsRoboTests
Change-Id: I5294439853ce35bccd883ed2aa21b33802d76cb1
Jordan Liu [Wed, 15 Aug 2018 03:09:31 +0000 (20:09 -0700)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
am:
5b7535d5b4
Change-Id: I7b1f6e53c521c0f17d17199de2f185eb64fd3c59
Jordan Liu [Tue, 14 Aug 2018 23:54:12 +0000 (23:54 +0000)]
Merge "Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED"
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 23:25:53 +0000 (16:25 -0700)]
[automerger skipped] Merge "Use new SubscriptionInfo constructor" am:
e8e24e7e0b am:
188272e12b
am:
d78a882bb1 -s ours
Change-Id: Idffe865742097d74f4d5373a41c5c2cf240f0032
jackqdyulei [Tue, 7 Aug 2018 22:12:54 +0000 (15:12 -0700)]
Disable bg restriction for "Disallow apps control"
Use RestrictedPreference so it could handle it automatically
Change-Id: Ibf58934639677b88316366b2e00790f9556d0966
Fixes:
64474641
Test: Robotests
irisykyang [Tue, 10 Apr 2018 07:34:33 +0000 (15:34 +0800)]
Reload APNs setting page when receive the intent ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED
Bug:
77250264
Test: Manual testing
Change-Id: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Merged-In: Ie28c67c89a2590425ff9c06153b53dac6cf141f0
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 22:06:16 +0000 (15:06 -0700)]
Merge "Use new SubscriptionInfo constructor" am:
e8e24e7e0b
am:
188272e12b
Change-Id: I3bd584dd5e8258713bd101e488ffefea81ad0a48
Lucas Dupin [Mon, 13 Aug 2018 17:39:52 +0000 (10:39 -0700)]
Add 'Reach to check' to lock screen settings
Also added to Gestures page to make sure we're following the
same structure for all gestures.
Change-Id: Iaa9e53e870165801decfa427441d01ee69bcce6d
Note: using dummy video. dependency on b/
112442049
Bug:
111414690
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ReachGesturePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ReachGestureSettings
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 20:59:07 +0000 (13:59 -0700)]
Merge "Use new SubscriptionInfo constructor"
am:
e8e24e7e0b
Change-Id: I1e51d7951cc3594685c9dd2e0b4c0e2aedb3e84f
TreeHugger Robot [Tue, 14 Aug 2018 19:43:37 +0000 (19:43 +0000)]
Merge "New ConditionManager"
Xiangyu/Malcolm Chen [Tue, 14 Aug 2018 18:58:25 +0000 (18:58 +0000)]
Merge "Use new SubscriptionInfo constructor"
Fan Zhang [Tue, 14 Aug 2018 18:16:31 +0000 (11:16 -0700)]
Reformat wifisettings fragment.
Bug:
111875856
Test: rebuild
Change-Id: I9f8d5aaab0dc5015416084aac273c4f01e52a4ed
Fan Zhang [Mon, 13 Aug 2018 19:10:19 +0000 (12:10 -0700)]
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
Malcolm Chen [Thu, 9 Aug 2018 23:32:32 +0000 (16:32 -0700)]
Use new SubscriptionInfo constructor
Bug:
92796390
Test: build
Change-Id: I5a90831b0050a0a201fce5b8f824fcb4c983a722
Merged-In: I5a90831b0050a0a201fce5b8f824fcb4c983a722
TreeHugger Robot [Tue, 14 Aug 2018 03:06:26 +0000 (03:06 +0000)]
Merge "Save BottomSheet state when screen rotate"
Kevin Chyn [Tue, 14 Aug 2018 02:57:56 +0000 (02:57 +0000)]
Merge "Stop camera enumeration after finding first camera"
Android Build Merger (Role) [Tue, 14 Aug 2018 02:08:05 +0000 (02:08 +0000)]
Merge "Merge stage-dr1-aosp-master into stage-aosp-master am:
fbc7d27155 am:
55ce535126"
Raff Tsai [Mon, 13 Aug 2018 05:37:42 +0000 (13:37 +0800)]
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
TreeHugger Robot [Tue, 14 Aug 2018 01:54:27 +0000 (01:54 +0000)]
Merge "Move ConditionListener to a top level class."
Xin Li [Tue, 14 Aug 2018 01:43:50 +0000 (18:43 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master am:
fbc7d27155
am:
55ce535126
Change-Id: I8a5b2cefa1e2845dc621a1d94816741966070f33
Kevin Chyn [Tue, 14 Aug 2018 01:32:47 +0000 (18:32 -0700)]
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
Xin Li [Tue, 14 Aug 2018 00:36:58 +0000 (17:36 -0700)]
Merge stage-dr1-aosp-master into stage-aosp-master
am:
fbc7d27155
Change-Id: I02a6acca4f15b665cf5b5f3f19d1df07b65264cb
Fan Zhang [Tue, 14 Aug 2018 00:31:08 +0000 (17:31 -0700)]
Move ConditionListener to a top level class.
So we can use it later for furture refactoring.
Bug:
112485407
Test: rebuild
Change-Id: Ic3994464cfaff67a56f2d383490860a81f436fbd
Lei Yu [Tue, 14 Aug 2018 00:05:01 +0000 (00:05 +0000)]
Merge "Refactor the BatteryInfo"