OSDN Git Service
Fan Zhang [Fri, 7 Sep 2018 01:40:20 +0000 (18:40 -0700)]
[automerger skipped] Merge "Move safety & regulatory manual closer to legal settings" into pi-dev am:
f81ec88024
am:
d735f982d2 -s ours
Change-Id: Ida1b0fc4ccd3a903752151c0a9227283150cccc6
Fan Zhang [Fri, 7 Sep 2018 01:33:30 +0000 (18:33 -0700)]
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
am:
f81ec88024
Change-Id: I7156cd60aed8ee1a8d439c6e1504df0b578a0ff3
TreeHugger Robot [Fri, 7 Sep 2018 01:05:45 +0000 (01:05 +0000)]
Merge "Move safety & regulatory manual closer to legal settings" into pi-dev
TreeHugger Robot [Thu, 6 Sep 2018 22:56:29 +0000 (22:56 +0000)]
Merge "Fix Battery Usage graph layout for small screens"
Fan Zhang [Thu, 6 Sep 2018 22:55:14 +0000 (22:55 +0000)]
Merge "Switch to GridLayoutManager to support two-column layout"
Fan Zhang [Thu, 6 Sep 2018 19:21:30 +0000 (12:21 -0700)]
Move safety & regulatory manual closer to legal settings
Bug:
113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Merged-In: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
TreeHugger Robot [Thu, 6 Sep 2018 21:52:34 +0000 (21:52 +0000)]
Merge "Move safety & regulatory manual closer to legal settings"
jackqdyulei [Thu, 6 Sep 2018 20:33:32 +0000 (13:33 -0700)]
[automerger skipped] Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev am:
205479c25d
am:
04e48eae76 -s ours
Change-Id: I1eb7a863a6467bc62a0234abd291ae360cdddf6c
jackqdyulei [Thu, 6 Sep 2018 20:14:18 +0000 (13:14 -0700)]
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
am:
205479c25d
Change-Id: Ib1ae9f0af0cabdc26dc883f58dbc28b37ce54e42
TreeHugger Robot [Thu, 6 Sep 2018 20:00:37 +0000 (20:00 +0000)]
Merge "Update PBAP info for all pairing dialogs. DO NOT MERGE" into pi-dev
Fan Zhang [Thu, 6 Sep 2018 19:21:30 +0000 (12:21 -0700)]
Move safety & regulatory manual closer to legal settings
Bug:
113788849
Test: visual
Change-Id: Ie9a706bad9a4c65ff06c2350171ad55f46dd8386
Mill Chen [Wed, 5 Sep 2018 12:35:37 +0000 (20:35 +0800)]
Switch to GridLayoutManager to support two-column layout
In order to display both half-width card and full-width card,
we use GridLayoutManager and SpanSizeLookup to achieve this purpose.
Bug:
111822407
Test: manual
Change-Id: I225fb0b5f731e3faf2bca9858395c40d318acf2f
Raff Tsai [Thu, 6 Sep 2018 01:15:24 +0000 (01:15 +0000)]
Merge "Modify Settings homepage layout"
Antony Sargent [Tue, 4 Sep 2018 21:41:21 +0000 (14:41 -0700)]
Fix Battery Usage graph layout for small screens
In PowerGaugePreference, if there isn't an icon to show, we were just
adding an empty one, which causes space to be reserved and isn't what we
want on small screens.
Bug:
111318404
Test: visual (set display size to Larger or Largest, and visit Battery
page in settings; the "Last full charge" and Screen usage since full
charge" items at the bottom should not be indented)
Change-Id: I60d39836ab7d50234022a377ff6d97dde8d4c7db
Doris Ling [Tue, 21 Aug 2018 21:12:57 +0000 (14:12 -0700)]
Remove unnecessary methods from SupportFeatureProvider.
Bug:
112587239
Test: make RunSettingsRoboTests
Change-Id: I7256fdbab1ae629b39cdd07da2fe813bd0fa455f
TSO FU WANG [Wed, 5 Sep 2018 09:11:50 +0000 (09:11 +0000)]
Merge ""Dsiabled" text aligns to textview right"
Stanley Wang [Wed, 29 Aug 2018 09:25:33 +0000 (17:25 +0800)]
"Dsiabled" text aligns to textview right
Change-Id: Id0c2b9de8355e977d1954998266079ba065c8c0b
Fixes:
112123106
Test: manual
Raff Tsai [Tue, 28 Aug 2018 14:02:29 +0000 (22:02 +0800)]
Modify Settings homepage layout
- Add BottomNavigationView which has two tabs
- Remove BottomSheet in layout files
Change-Id: I493290fa9dee0566c73c5c9d7fbba10b71b4e2b4
Fixes:
113266753
Test: visual
TreeHugger Robot [Wed, 5 Sep 2018 01:50:08 +0000 (01:50 +0000)]
Merge "Add conditional cards to the new homepage."
TreeHugger Robot [Tue, 4 Sep 2018 20:28:26 +0000 (20:28 +0000)]
Merge "Fix keyguard checking when installing user certs."
tiansiming [田思明] [Tue, 4 Sep 2018 20:09:21 +0000 (13:09 -0700)]
Merge "Update string for message of DirectBootWarnDialog" am:
b0cc3a6c7d am:
662e59e628
am:
792ed7ffaf
Change-Id: Iaff158cf9588d55aa508eb7f75fe961dc5ede03a
tiansiming [田思明] [Tue, 4 Sep 2018 20:05:10 +0000 (13:05 -0700)]
Merge "Update string for message of DirectBootWarnDialog" am:
b0cc3a6c7d
am:
662e59e628
Change-Id: I58f28cc3473c72c2061cc4c90cc6a2d50812e670
tiansiming [田思明] [Tue, 4 Sep 2018 19:55:11 +0000 (12:55 -0700)]
Merge "Update string for message of DirectBootWarnDialog"
am:
b0cc3a6c7d
Change-Id: Ie04be9cf61a87fcc2b866d4effd0d27ca21064db
Treehugger Robot [Tue, 4 Sep 2018 19:46:18 +0000 (19:46 +0000)]
Merge "Update string for message of DirectBootWarnDialog"
Pavel Grafov [Fri, 31 Aug 2018 16:55:18 +0000 (17:55 +0100)]
Fix keyguard checking when installing user certs.
Currently the condition is inverted, so the user is asked to enroll
a password only when there is one already.
Also, use existing method instead of a duplicate one. LPU.isSecure doesn't
check the credential owner, but for unified lock with empty parent password
it will correctly return false, so should be correct.
Bug:
113646620
Test: manual, tried installing user certs with and without screen lock.
Change-Id: Iabb1614540e454873e48039be13e22cc89b0a7be
tiansiming [田思明] [Thu, 18 Jan 2018 12:50:48 +0000 (20:50 +0800)]
Update string for message of DirectBootWarnDialog
Some users feedback to us that they are not very clear of the
meaning of the string 'direct_boot_unaware_dialog_message'.
The updated one may be more clear.
Bug: https://partnerissuetracker.corp.google.com/u/0/issues/
72197006
Test: manual test. Go to the Available virtual keyboard interface,
turn on a 3rd party ime keyboard and check the message.
Change-Id: Ib3a999601fa40f678956550d8941b7cb1db8a9af
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
Bill Yi [Fri, 31 Aug 2018 16:04:45 +0000 (09:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
94fdfc4a44 -s ours
am:
05cd61956a -s ours
Change-Id: Icb674fc30b2c442a11fd46652147ba6ec78fbe5f
Bill Yi [Fri, 31 Aug 2018 15:56:23 +0000 (08:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
94fdfc4a44 -s ours
Change-Id: I5e27882dde15352c8121ed35eb72114f33ff8d53
Philip P. Moltmann [Fri, 31 Aug 2018 04:47:28 +0000 (04:47 +0000)]
Merge "RestrictedLockUtils was split into ...Internal"
Bill Yi [Fri, 31 Aug 2018 02:02:59 +0000 (19:02 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I6b44e763661339eab9182743abd1e3cb4d8bdbcd
Emily Chuang [Wed, 29 Aug 2018 11:47:00 +0000 (19:47 +0800)]
Add conditional cards to the new homepage.
Make existing Settings Conditions show up in the new homepage as custom
view.
Bug:
113451905
Test: robotests
Change-Id: Ic49089f95ff04442a887cda97481e945136f7209
TreeHugger Robot [Fri, 31 Aug 2018 01:21:07 +0000 (01:21 +0000)]
Merge "Update Settings to match Framework"
TreeHugger Robot [Fri, 31 Aug 2018 00:41:24 +0000 (00:41 +0000)]
Merge "Remove the deprecated class DataUsageBase."
Youming Ye [Thu, 30 Aug 2018 23:07:40 +0000 (16:07 -0700)]
Merge "Fix the Wifi Calling back button goes to wrong screen" am:
903d2610dd am:
7c4b70c6e5
am:
05281b8d4b
Change-Id: If7b7e7fab2aa0e8d81d185363685b419d5630cb1
Youming Ye [Thu, 30 Aug 2018 22:47:05 +0000 (15:47 -0700)]
Merge "Fix the Wifi Calling back button goes to wrong screen" am:
903d2610dd
am:
7c4b70c6e5
Change-Id: Iaf9670b98ef838967ceed1dc9f8cf950532fc48b
Youming Ye [Thu, 30 Aug 2018 22:28:44 +0000 (15:28 -0700)]
Merge "Fix the Wifi Calling back button goes to wrong screen"
am:
903d2610dd
Change-Id: I41466f3f6e77c66f77550900193320b48a123d21
Youming Ye [Thu, 30 Aug 2018 22:03:06 +0000 (22:03 +0000)]
Merge "Fix the Wifi Calling back button goes to wrong screen"
Doris Ling [Thu, 30 Aug 2018 21:16:13 +0000 (14:16 -0700)]
Remove the deprecated class DataUsageBase.
- and update all its subclass to extend DataUsageBaseFragment instead.
Bug:
111751694
Test: make RunSettingsRoboTests
Change-Id: Ic5720af43082d8b39642b6a539515f3f20d32694
Philip P. Moltmann [Tue, 28 Aug 2018 22:01:43 +0000 (15:01 -0700)]
RestrictedLockUtils was split into ...Internal
This means that in some cases RestrictedLockUtils has to be used and in
some RestrictedLockUtilsInternal.
This causes a lot of trivial code changes.
I also updated the ordering of the imports in all affected files.
Bug:
110953302
Test: Built
make -j RunSettingsRoboTests
Change-Id: I9bdf8b89134f853bae4f38c81af436715c73e924
timhypeng [Thu, 23 Aug 2018 04:53:17 +0000 (12:53 +0800)]
call getName() from CachedBluetoothDevice, not CachedBluetoothDeviceManager
-add test case "onGetDeviceName"
Bug:
112735753
Test: make -j42 RunSettingsRoboTests
Change-Id: Id62b6eb8be38fb6ac69ca371563be899b8d61aff
Youming Ye [Thu, 30 Aug 2018 01:20:22 +0000 (18:20 -0700)]
Fix the Wifi Calling back button goes to wrong screen
The Wifi Calling activitis had Settings as it's parent activity.
Remove the parent declaration to navigate Wifi Calling screen back
to previous activity or fragment correctly.
Bug:
111818398
Test: Manual
Change-Id: I95168785936aeea0740dbb8e26280eaa8417c015
Raff Tsai [Thu, 30 Aug 2018 01:08:24 +0000 (01:08 +0000)]
Merge "Close searchActivity doesn't go back to previous activity"
Aurimas Liutikas [Wed, 29 Aug 2018 19:30:55 +0000 (12:30 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." am:
a544f17b99 -s ours am:
2b0960c2d1 -s ours
am:
77d2f1f8ab -s ours
Change-Id: Ic21b9bb2c530a19d07aaecaeaf273451288ebef1
Aurimas Liutikas [Wed, 29 Aug 2018 19:14:32 +0000 (12:14 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." am:
a544f17b99 -s ours
am:
2b0960c2d1 -s ours
Change-Id: I4b60d96d764c1ccf1cc5083e0b19f7a196c4c44a
Aurimas Liutikas [Wed, 29 Aug 2018 19:00:24 +0000 (12:00 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx."
am:
a544f17b99 -s ours
Change-Id: I507cbff22f0daa46c9aaac05646f23698f86d861
Treehugger Robot [Wed, 29 Aug 2018 18:31:08 +0000 (18:31 +0000)]
Merge "Migrate Settings to androidx."
Raff Tsai [Wed, 29 Aug 2018 15:22:12 +0000 (23:22 +0800)]
Close searchActivity doesn't go back to previous activity
When requestCode is 0, we will not finish activity.
Change-Id: Ib630951739031b05c83efe189875a4a41c8e51ec
Fixes:
113372155
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.password"
TreeHugger Robot [Wed, 29 Aug 2018 14:11:16 +0000 (14:11 +0000)]
Merge "Grant permission on slice uris based on whitelist"
TreeHugger Robot [Wed, 29 Aug 2018 10:02:09 +0000 (10:02 +0000)]
Merge "Add null check for vrManager"
Kevin Chyn [Sun, 26 Aug 2018 22:43:00 +0000 (15:43 -0700)]
Update Settings to match Framework
Bug:
72825012
Test: atest SettingsRoboTests
Change-Id: Ie59347bcb5d6748b3e684541b390c8e5f6db3f4a
Fan Zhang [Tue, 28 Aug 2018 22:02:10 +0000 (15:02 -0700)]
Grant permission on slice uris based on whitelist
Bug:
112587202
Test: robotests
Change-Id: I4e12a73f0acd848153f32c2569358dd55bed3f92
Fan Zhang [Wed, 29 Aug 2018 00:19:53 +0000 (00:19 +0000)]
Merge "Sort imports"
Aurimas Liutikas [Tue, 17 Apr 2018 18:22:43 +0000 (11:22 -0700)]
Migrate Settings to androidx.
Test: make Settings
Bug:
76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit
a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89)
(cherry picked from commit
b1af85d15523db44d4fa80c78409069ec691ed0a)
hjchangliao [Tue, 28 Aug 2018 22:36:05 +0000 (15:36 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am:
6e2db2c34b -s ours am:
e89bf878c6 -s ours
am:
77e838e451 -s ours
Change-Id: Iba46b140281e73cfe82fd462622f6c7e983fdf4c
Colin Cross [Tue, 28 Aug 2018 22:17:41 +0000 (15:17 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master am:
048f11d0a9 -s ours
am:
90184808c1 -s ours
Change-Id: I9adcfe2dfdc6613024c7bba754bd2543e392c556
hjchangliao [Tue, 28 Aug 2018 22:15:25 +0000 (15:15 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP" am:
6e2db2c34b -s ours
am:
e89bf878c6 -s ours
Change-Id: I7e8d43ab2a4c1e735a4e855ce93212b20aa0e858
Android Build Merger (Role) [Tue, 28 Aug 2018 22:14:08 +0000 (22:14 +0000)]
Merge "[automerger skipped] Migrate Settings to androidx. am:
b1af85d155 -s ours am:
44593b7bac -s ours"
Fan Zhang [Tue, 28 Aug 2018 22:11:40 +0000 (15:11 -0700)]
Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master
Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Aurimas Liutikas [Tue, 28 Aug 2018 22:12:27 +0000 (15:12 -0700)]
[automerger skipped] Migrate Settings to androidx. am:
b1af85d155 -s ours
am:
44593b7bac -s ours
Change-Id: Ifc73b43625413bb89223875f99d8e0e99b9a2c91
TreeHugger Robot [Tue, 28 Aug 2018 22:08:41 +0000 (22:08 +0000)]
Merge "Turn down app indexing for slices."
hjchangliao [Tue, 28 Aug 2018 22:07:13 +0000 (15:07 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
am:
6e2db2c34b -s ours
Change-Id: I3e0340030a240a2e51209deeed0915ac62a1dcda
Colin Cross [Tue, 28 Aug 2018 22:03:29 +0000 (15:03 -0700)]
[automerger skipped] Merge "Migrate Settings to androidx." into stage-aosp-master
am:
048f11d0a9 -s ours
Change-Id: I9aafcf6e8525db976ddb5ce29d53dd5bdf612d70
Aurimas Liutikas [Tue, 28 Aug 2018 21:59:45 +0000 (14:59 -0700)]
[automerger skipped] Migrate Settings to androidx.
am:
b1af85d155 -s ours
Change-Id: I098cc300a217762bcb77bc1b0b5f6ee6bdbc56dd
Fan Zhang [Tue, 28 Aug 2018 21:55:39 +0000 (14:55 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am:
56cc4986df -s ours am:
0e05005d8d -s ours
am:
e8bf02f256 -s ours
Change-Id: I4858f230255f0c19a5e7a4ac9ffd0c85841721f1
Treehugger Robot [Tue, 28 Aug 2018 21:54:01 +0000 (21:54 +0000)]
Merge "DO NOT MERGE: Cherry-pick misc fixes to AOSP"
Fan Zhang [Tue, 28 Aug 2018 21:45:42 +0000 (14:45 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am:
56cc4986df -s ours
am:
0e05005d8d -s ours
Change-Id: Ieb1b69c3fb1f42750044b49c270f4d533bbfb51b
Colin Cross [Tue, 28 Aug 2018 21:42:48 +0000 (21:42 +0000)]
Merge "Migrate Settings to androidx." into stage-aosp-master
Fan Zhang [Tue, 28 Aug 2018 21:41:43 +0000 (14:41 -0700)]
[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP"
am:
56cc4986df -s ours
Change-Id: Iff1f6e189feae17f1166990de31d6f64f920734e
Treehugger Robot [Tue, 28 Aug 2018 21:29:05 +0000 (21:29 +0000)]
Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP"
Fan Zhang [Tue, 28 Aug 2018 20:47:28 +0000 (13:47 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am:
fcaf926dc1 -s ours am:
6e65a32468 -s ours
am:
9fe69d724d -s ours
Change-Id: If7f67c5a8f32045dd9e1b63f61614b03cfbd9bed
Fan Zhang [Tue, 28 Aug 2018 20:43:08 +0000 (13:43 -0700)]
Turn down app indexing for slices.
Bug:
112587202
Test: robotests
Change-Id: Ice84173bd9617f58689438c460522104776c46ce
hjchangliao [Fri, 27 Apr 2018 03:27:46 +0000 (11:27 +0800)]
DO NOT MERGE: Cherry-pick misc fixes to AOSP
Remove wrapper for LocationManager
Remove LocationManagerWrapper from SettingsLib
Bug:
76167422
Test: RunSettingsRoboTests
Remove OverlayManagerWrapper class out from Settings
Remove OverlayManagerWrapper and use IOverlayManager instead. Based on
comment from reviewer to refactor ThemePreferenceController.
Bug:
76167422
Test: RunSettingsRoboTests
Change-Id: I13a7997b5e21a16ffb723971d267132fbf65e4a6
Aurimas Liutikas [Tue, 28 Aug 2018 19:22:49 +0000 (12:22 -0700)]
[automerger skipped] Migrate Settings to androidx.
am:
a290b873d0 -s ours
Change-Id: I9ba23b9406f2f7397de78c86aa3eccf5be4fe22d
Fan Zhang [Mon, 27 Aug 2018 21:28:54 +0000 (14:28 -0700)]
DO NOT MERGE: Cherry-pick a bunch fixes to AOSP
Task affinity updates
- Remove task affinity for AppDrawOver Settings
- Remove task affinity for ConfigNotificationSettings
The task affinity is messing with the back stack for this activity when
launched externally
Fixes:
80281932
Fixes:
80290571
Test: manual
Disable uninstall update option for secondary users.
Fixes:
110249550
Test: manual
Suppress some gesture search when there is no hardware
Fixes:
110250839
Test: robotests
Check wifi password length by byte, not char.
Change-Id: Ic25ef766886507211c3de8764c1cffef2b27a025
Fixes:
79209073
Test: robotest
Fan Zhang [Tue, 28 Aug 2018 19:14:58 +0000 (12:14 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors" am:
fcaf926dc1 -s ours
am:
6e65a32468 -s ours
Change-Id: Iaf37f20f3ff607c46a66eb278dc17d6998f87984
Aurimas Liutikas [Tue, 17 Apr 2018 18:22:43 +0000 (11:22 -0700)]
Migrate Settings to androidx.
Test: make Settings
Bug:
76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
(cherry picked from commit
a290b873d05c64ebdd9aeff8ffccf0a6dcbffc89)
Fan Zhang [Tue, 28 Aug 2018 18:38:27 +0000 (11:38 -0700)]
[automerger skipped] Merge "DO NOT MERGE Fix color_lint errors"
am:
fcaf926dc1 -s ours
Change-Id: I4d66ba0b4164b5b700c7671f5d249c30ad38722e
TreeHugger Robot [Tue, 28 Aug 2018 18:36:23 +0000 (18:36 +0000)]
Merge "Remove unneeded getDisplayableCards() in DashboardAdapter"
Treehugger Robot [Tue, 28 Aug 2018 18:03:31 +0000 (18:03 +0000)]
Merge "DO NOT MERGE Fix color_lint errors"
Fan Zhang [Tue, 28 Aug 2018 17:26:19 +0000 (10:26 -0700)]
Remove unneeded getDisplayableCards() in DashboardAdapter
It will be called when window gets focus, no need to call it here.
Change-Id: I1c4b3b745edb2519e778f8354684d90e2eb55004
Fixes:
113175600
Test: manual
Fan Zhang [Mon, 27 Aug 2018 21:28:54 +0000 (14:28 -0700)]
DO NOT MERGE Fix color_lint errors
Test: repo upload
Change-Id: I83abb69123e1365cf90db2ab0f60c3a6330f2828
TreeHugger Robot [Tue, 28 Aug 2018 16:02:42 +0000 (16:02 +0000)]
Merge "Clean up the main architecture of Contextual Settings Homepage."
Christine Franks [Tue, 28 Aug 2018 15:45:35 +0000 (15:45 +0000)]
Merge "Remove demo restrictions"
TreeHugger Robot [Tue, 28 Aug 2018 15:04:26 +0000 (15:04 +0000)]
Merge "Updated the CardContentProvider"
TreeHugger Robot [Tue, 28 Aug 2018 14:32:04 +0000 (14:32 +0000)]
Merge "Show bonded devices in "Pair new device"(2/2)"
Emily Chuang [Tue, 28 Aug 2018 10:25:20 +0000 (18:25 +0800)]
Clean up the main architecture of Contextual Settings Homepage.
- Add lifecycle observer in HomepageManager.
- Rename some variables.
Bug:
111676964
Test: robotests
Change-Id: Ic91c53f2c1622d602b3edc664a06a13aa6945f47
Rick Yiu [Tue, 28 Aug 2018 06:06:46 +0000 (14:06 +0800)]
Add null check for vrManager
If VrManagerService is not started, vrManager will be null. Need
add check for it.
Test: robotests
Bug:
112064298
Change-Id: I899337bb5a996efffe82970fa690f2c5d59c1bb5
Sunny Shao [Mon, 27 Aug 2018 08:58:39 +0000 (16:58 +0800)]
Updated the CardContentProvider
- Removed the availability_uri field
- Changed the card_action data type to integer
- Added the support_half_width field
- Modify the Database version to 2
Bug:
111820446
Test: robotest
Change-Id: I755ad93a05034037bab18e709f53b4af3ce4fe5e
Ash_Chen [Fri, 17 Aug 2018 14:31:41 +0000 (22:31 +0800)]
Show bonded devices in "Pair new device"(2/2)
Some users forgot they had paired devices and couldn't see their BT device
when they search device in "Pair new device". (b/
80382940, b/
80133137).
Need to change the behavior to let paired devices can be shown on "Available devices".
Bug:
111738593
Test: Bluetooth Pairing Test
Change-Id: Ib499785abaa8e4efc1875be113ac87bdbe0c89ba
SongFerng Wang [Tue, 28 Aug 2018 02:40:02 +0000 (02:40 +0000)]
Merge "SIM status page sync signal strength and service state behavior from systemUI"
Christine Franks [Mon, 27 Aug 2018 22:42:58 +0000 (15:42 -0700)]
Remove demo restrictions
These are now available as user restrictions.
Bug:
113298946
Test: make RunSettingsRoboTests -j100
Change-Id: I637083c8edcf43b99cebbf5a7dfd60afee441ade
Aurimas Liutikas [Tue, 17 Apr 2018 18:22:43 +0000 (11:22 -0700)]
Migrate Settings to androidx.
Test: make Settings
Bug:
76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
Merged-In: I941dea40562170649bf056e675cc32e5163c0e39
Doris Ling [Mon, 27 Aug 2018 21:11:55 +0000 (14:11 -0700)]
Add log when the advanced button is clicked.
- register the advanced button expand listener and add the metrics log
when it is clicked.
Fixes:
70930626
Test: make RunSettingsRoboTests
Change-Id: Ife4af4bd4a0a8534cf9ba63949660a810b09446a
Bill Yi [Sun, 26 Aug 2018 20:05:18 +0000 (13:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
994ae82c34 -s ours
am:
016843fa80 -s ours
Change-Id: I6532b8b1a57aa016227468720258c5ddec03850c
Bill Yi [Sun, 26 Aug 2018 19:58:09 +0000 (12:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
994ae82c34 -s ours
Change-Id: I779083c8a8685a719d462160cfd8c8b4479a406c
Doris Ling [Sun, 26 Aug 2018 06:34:33 +0000 (23:34 -0700)]
[automerger skipped] Merge "Fix crash in clicking Default Home gear icon." am:
0c724f5181 am:
51a72d4c38
am:
323e54ddf5 -s ours
Change-Id: Ia039b43a5e4301e0b7451181ef4be95e18bd847d
Doris Ling [Sun, 26 Aug 2018 06:24:51 +0000 (23:24 -0700)]
Merge "Fix crash in clicking Default Home gear icon." am:
0c724f5181
am:
51a72d4c38
Change-Id: I7ff6b0e405c3d87faa869bd53eee9983648ccf69
Doris Ling [Sun, 26 Aug 2018 06:12:24 +0000 (23:12 -0700)]
Merge "Fix crash in clicking Default Home gear icon."
am:
0c724f5181
Change-Id: I53b6c18077d0bcf5a7bc13fcc425c6c1ca4143ad
Bill Yi [Sat, 25 Aug 2018 23:44:47 +0000 (16:44 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I3e4f6e468679eec2ad1d8b821115e686e5a4c19a
TreeHugger Robot [Sat, 25 Aug 2018 01:09:17 +0000 (01:09 +0000)]
Merge "Create the main architecture for Settings Dynamic Homepage"
OSDN Git Service
