OSDN Git Service
Lei Yu [Wed, 11 Jul 2018 22:23:36 +0000 (22:23 +0000)]
Merge "Add sanity check method for BatteryTip"
TreeHugger Robot [Wed, 11 Jul 2018 21:21:13 +0000 (21:21 +0000)]
Merge "Clean up: remove preference_category_no_title."
TreeHugger Robot [Wed, 11 Jul 2018 20:19:44 +0000 (20:19 +0000)]
Merge "Import translations. DO NOT MERGE"
Fan Zhang [Wed, 11 Jul 2018 18:44:51 +0000 (11:44 -0700)]
Clean up: remove preference_category_no_title.
We already have a custom category layout that does the same thing.
Test: visual
Change-Id: Ice6daea8b2d9a14e9b013cf4175ce00f5ab1cc8d
Bill Yi [Wed, 11 Jul 2018 17:55:29 +0000 (10:55 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
11ebb14241 -s ours
am:
78f73c3352 -s ours
Change-Id: I56573cf23cf9cfb1f849f207afdcb3c63f2445e5
Bill Yi [Wed, 11 Jul 2018 17:48:27 +0000 (10:48 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
11ebb14241 -s ours
Change-Id: Idb03e6fbae91f20729a4ebbd504255c99bbba606
Bill Yi [Wed, 11 Jul 2018 05:28:21 +0000 (22:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id9deb2f66c09d1b17c35d8226673768d40d7eef7
Bill Yi [Wed, 11 Jul 2018 04:10:39 +0000 (21:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8e05b06302b091c99cfac9babc6a7ef4abafed17
Auto-generated-cl: translation import
Kevin Chyn [Wed, 11 Jul 2018 03:27:02 +0000 (03:27 +0000)]
Merge "4/n: Add basic enrollment for Face"
TreeHugger Robot [Wed, 11 Jul 2018 01:46:15 +0000 (01:46 +0000)]
Merge "Add a few pages to search index."
Kevin Chyn [Wed, 11 Jul 2018 01:43:17 +0000 (01:43 +0000)]
Merge "Fixed various strings & limits"
Kevin Chyn [Fri, 29 Jun 2018 00:59:32 +0000 (17:59 -0700)]
4/n: Add basic enrollment for Face
Bug:
110589286
Test: fingerprint enrolling still works
Test: enrollment flow with and without a pin set up still works properly
Test: enrollment continues when configuration changes, stops otherwise
Change-Id: I39f76c7f1a16e9533cef573f87cf4b81cb20cb18
Lei Yu [Mon, 9 Jul 2018 21:53:55 +0000 (14:53 -0700)]
Add sanity check method for BatteryTip
This method is used to check whether data in battery tip is still
valid. If not, try recover the data or dismiss the tip.
Change-Id: Idc9e4d49f99e33d3f5e82e694dc78227fc1da41c
Fixes:
111218723
Test: RunSettingsRoboTests
Fan Zhang [Tue, 10 Jul 2018 22:46:31 +0000 (15:46 -0700)]
Add a few pages to search index.
- Data saver
- A few special permission access pages
- Picture-in-picture
- Premium sms
- do not disturb access
- And a unrelated cleanup: move EmptyTextFragment from
notification/ to widget/
Bug:
70720645
Test: robotests
Change-Id: I6a87f712bf81f9fd32fa9a3826fba851ca748409
Lei Yu [Tue, 10 Jul 2018 23:01:13 +0000 (23:01 +0000)]
Merge "Remove DeviceProfilesSettings"
TreeHugger Robot [Tue, 10 Jul 2018 20:36:44 +0000 (20:36 +0000)]
Merge "Update auto brightness pref summary to show on/off"
jackqdyulei [Tue, 10 Jul 2018 18:26:35 +0000 (11:26 -0700)]
Remove DeviceProfilesSettings
It's not used anymore since we have a bt detail page.
Change-Id: Ib2ecfabf544913701ca613048e9f37e297ffff18
Fixes:
111305587
Test: robo still pass
Salvador Martinez [Tue, 10 Jul 2018 19:46:09 +0000 (12:46 -0700)]
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev am:
4804c2c7a5
am:
94bebd2f80
Change-Id: Ia5274cd69ce2d6208cf9490b7a41ec080090cb6f
Salvador Martinez [Tue, 10 Jul 2018 19:41:50 +0000 (12:41 -0700)]
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
am:
4804c2c7a5
Change-Id: I81b835965ee39d8c877e834820ca21543d18d654
TreeHugger Robot [Tue, 10 Jul 2018 19:33:29 +0000 (19:33 +0000)]
Merge "Fix incorrect method call to wifiManager in Tether" into pi-dev
Fan Zhang [Tue, 10 Jul 2018 18:25:18 +0000 (11:25 -0700)]
Update auto brightness pref summary to show on/off
Change-Id: I7914957cc9dbffcc12e34fc714bb9c37783a4f33
Fixes:
109885418
Test: robotests
TreeHugger Robot [Tue, 10 Jul 2018 17:45:28 +0000 (17:45 +0000)]
Merge "Update airplane mode pref key so it's sliceable."
Kevin Chyn [Tue, 10 Jul 2018 17:20:43 +0000 (10:20 -0700)]
Fixed various strings & limits
Fixes:
111170847
Fixes:
111137762
Fixes:
111174545
Fixes:
111174330
Fixes:
111174332
Fixes:
111173644
Test: builds
Change-Id: Ia39fe7b70a1bb5ac6f71c8244268aab51deed0ee
Fan Zhang [Tue, 10 Jul 2018 16:46:32 +0000 (09:46 -0700)]
Update airplane mode pref key so it's sliceable.
Bug:
110403709
Test: rebuild slice db
Change-Id: I16e13ec67705754fc55d8c797f94e407f617722c
TreeHugger Robot [Tue, 10 Jul 2018 02:11:34 +0000 (02:11 +0000)]
Merge "Fix NPE when querying AmbientDisply through ExternalSeting"
Fan Zhang [Mon, 9 Jul 2018 23:45:22 +0000 (16:45 -0700)]
Fix NPE when querying AmbientDisply through ExternalSeting
Bug:
110403709
Test: manual
Change-Id: I5c037b010e296cbd011f8c141932e6befd341c99
Hall Liu [Tue, 10 Jul 2018 00:08:14 +0000 (00:08 +0000)]
Merge "Fix usage of SubscriptionInfo ctor"
TreeHugger Robot [Mon, 9 Jul 2018 23:17:59 +0000 (23:17 +0000)]
Merge "Handle special case slices"
TreeHugger Robot [Mon, 9 Jul 2018 22:28:55 +0000 (22:28 +0000)]
Merge "ZenScheduleRule is valid even if it never occurs"
Salvador Martinez [Mon, 9 Jul 2018 18:52:34 +0000 (11:52 -0700)]
Fix incorrect method call to wifiManager in Tether
In the WifiTetherApBandController the incorrect method was
being called to check if the device is 5Ghz compatible. We
were calling is5GhzBandSupported directly, but we were
supposed to call isDualBandSupported instead.
Test: robotests updated
Bug:
110793581
Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9
Matthew Fritze [Tue, 12 Jun 2018 00:20:53 +0000 (17:20 -0700)]
Handle special case slices
Create a handler for any slice that doesn't include anything
from a PreferenceController.
Test: robotests
Change-Id: If23947152d61877537d0cac6240e96b9ab977bce
Bug:
80263568
TreeHugger Robot [Mon, 9 Jul 2018 18:07:36 +0000 (18:07 +0000)]
Merge "Ask profile password before unifying to prevent untrusted reset"
Pavel Grafov [Mon, 9 Jul 2018 17:54:22 +0000 (10:54 -0700)]
[automerger skipped] Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev am:
dc2db6c6c9
am:
0886bf2271 -s ours
Change-Id: I77850967d6d28f6f638bb7327def038e365c653c
Pavel Grafov [Mon, 9 Jul 2018 17:49:22 +0000 (10:49 -0700)]
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
am:
dc2db6c6c9
Change-Id: Id0362b8917255d81dfc83ecccc913aaa8c8349a2
TreeHugger Robot [Mon, 9 Jul 2018 17:45:34 +0000 (17:45 +0000)]
Merge "Fix NPE when querying AmbientDisply through ExternalSeting"
TreeHugger Robot [Mon, 9 Jul 2018 17:37:19 +0000 (17:37 +0000)]
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS." into pi-dev
Beverly [Fri, 6 Jul 2018 16:05:00 +0000 (12:05 -0400)]
ZenScheduleRule is valid even if it never occurs
Bug:
111167252
Test: make RunSettingsRoboTests -j40
Change-Id: Ibb564b2b0bca049afb17641e372276e58e487df2
Pavel Grafov [Wed, 20 Jun 2018 16:20:05 +0000 (17:20 +0100)]
Ask profile password before unifying to prevent untrusted reset
Test: make -j RunSettingsRoboTests
Test: manual, unify when profile lock is compliant
Test: manual, unify when profile lock is not compliant
Test: manual, unify when profile lock is empty
Fixes:
110262879
Change-Id: I0dfa885f2a0e44e09c217b3e7766b367f1340c9e
Bill Yi [Fri, 6 Jul 2018 03:15:20 +0000 (20:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e338a41dac -s ours
am:
1d8eba660f -s ours
Change-Id: Id6f319ff37f94400ff9bd0379fe3da2567c1445f
Bill Yi [Fri, 6 Jul 2018 03:03:16 +0000 (20:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e338a41dac -s ours
Change-Id: Ifb7f5f0271381fb960b74722457a58ddb82429cf
TreeHugger Robot [Thu, 5 Jul 2018 04:17:36 +0000 (04:17 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 5 Jul 2018 04:09:50 +0000 (21:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id2d2fbe5bc2473fa6de24605fc5dbef0ae4e626f
TreeHugger Robot [Thu, 5 Jul 2018 03:46:24 +0000 (03:46 +0000)]
Merge changes from topic "q_dark_theme"
* changes:
Move NightMode to Display settings
Revert "Setting to change sysui theme"
Bill Yi [Thu, 5 Jul 2018 02:51:56 +0000 (19:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I43de322478c209034c56686b9f2ca195ed1eb815
Auto-generated-cl: translation import
Pavel Grafov [Tue, 3 Jul 2018 19:31:42 +0000 (20:31 +0100)]
Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.
Bug:
111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
Merged-In: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
(cherry picked from commit
f14de789f4cc7d145e6011e5a5562876e25c3f31)
TreeHugger Robot [Tue, 3 Jul 2018 22:35:45 +0000 (22:35 +0000)]
Merge "Fix new user setting in a call"
Matthew Fritze [Tue, 3 Jul 2018 21:43:46 +0000 (14:43 -0700)]
[automerger skipped] Merge "Conditionally block battery percantage from search" into pi-dev am:
ea97a66383
am:
76acf317a5 -s ours
Change-Id: I037b7f21c32474a769d4e870664b3e6d812148f3
Matthew Fritze [Tue, 3 Jul 2018 21:39:07 +0000 (14:39 -0700)]
Merge "Conditionally block battery percantage from search" into pi-dev
am:
ea97a66383
Change-Id: If61f6e81aebd70c88e8fc75a525f53bed3ddbac1
TreeHugger Robot [Tue, 3 Jul 2018 21:35:32 +0000 (21:35 +0000)]
Merge "Conditionally block battery percantage from search" into pi-dev
Yongjiang Wu [Wed, 12 Oct 2016 05:35:38 +0000 (13:35 +0800)]
Fix new user setting in a call
In a call, the flag of UserManager is changed, then "Add user" and
"Guest" items in Settings are still enabled.
To fix this issue, these items will be disabled according to
"UserManager#canSwitchUsers".
Bug:
80447394
Test: make RunSettingsRoboTests ROBOTEST_FILTER=UserSettingsTest
Change-Id: Ib4c754603418528f5c6f1c78b8aabf33e863c8b9
Android Build Merger (Role) [Tue, 3 Jul 2018 20:55:43 +0000 (20:55 +0000)]
Merge "[automerger skipped] Merge "Unrestrict app if it been set as device admin app" into pi-dev am:
f406fd7976 am:
13d51cd39a -s ours"
Lei Yu [Tue, 3 Jul 2018 20:54:42 +0000 (13:54 -0700)]
[automerger skipped] Merge "Unrestrict app if it been set as device admin app" into pi-dev am:
f406fd7976
am:
13d51cd39a -s ours
Change-Id: Ifd51d45a75bb245c2853773a966c6accb226b5ba
TreeHugger Robot [Tue, 3 Jul 2018 20:54:29 +0000 (20:54 +0000)]
Merge "Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS."
TreeHugger Robot [Tue, 3 Jul 2018 20:47:16 +0000 (20:47 +0000)]
Merge "Using icon resource instead of icon bitmap in task description"
Lei Yu [Tue, 3 Jul 2018 20:42:30 +0000 (13:42 -0700)]
Merge "Unrestrict app if it been set as device admin app" into pi-dev
am:
f406fd7976
Change-Id: Ic085eeee8d18999d56e7432bb13af342c0e00786
TreeHugger Robot [Tue, 3 Jul 2018 20:24:58 +0000 (20:24 +0000)]
Merge "Unrestrict app if it been set as device admin app" into pi-dev
Fan Zhang [Tue, 3 Jul 2018 19:42:33 +0000 (12:42 -0700)]
Fix NPE when querying AmbientDisply through ExternalSeting
Bug:
110403709
Test: manual
Change-Id: Iee9994061c2b5c4bdd7aefe2d25a73e8ed4c9db0
Pavel Grafov [Tue, 3 Jul 2018 19:31:42 +0000 (20:31 +0100)]
Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS.
Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS,
profile can only set notifications to be redacted. When the
user changes notification settings for a work app, this class
is invoked from the profile, meaning it attempts to read
LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not
there. As a result the function always returs 0 for work apps.
Bug:
111112011
Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad
Sunny Goyal [Tue, 3 Jul 2018 18:39:00 +0000 (11:39 -0700)]
Using icon resource instead of icon bitmap in task description
Bug:
110739775
Test: Verfied that the icon is displayed correctly if icon-shape override is applied in laucher
Change-Id: Ice7e15a982479960b2644defa33dbdb036c6bd42
Matthew Fritze [Mon, 2 Jul 2018 18:22:59 +0000 (11:22 -0700)]
Conditionally block battery percantage from search
The PowerUsageSummary fragment doesn't use the regular pattern
of a static method to build preference controllers, which can be
accessed by both DashboardFragment and BaseSearchIndexProvider,
because it depends on the Activity & Fragment in the creation of
the preference controllers.
The correct & long-term solution here would be to move those dependencies
out of the getPreferenceControllers method, such that the we could use a
static buildPreferenceControllers method, as seen in DisplaySettings.java.
In the mean time, we know that BatteryPercentagePrefController should not
show up on devices, so we conditionally add the the preference controller's
into getNonIndexableKeys method based on controller Availability, which
BasePreferenceController normally does automatically with a getPreferenceController
method in the host fragment's SEARCH_INDEX_DATA_PROVIDER.
Since this is a short-term solution, it should not be merged into master, and thus
I am not marking the bug as fixed.
Bug:
110894466
Test: Robotests
Change-Id: I06f814571d0b72fbf020dd11a9d23a9eb9907bfd
Merged-In: I5993d332dbd218c981ef5432aebb735d0000f67a
Bill Yi [Tue, 3 Jul 2018 02:30:53 +0000 (19:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
20fa188802 -s ours
am:
219ffa7e4e -s ours
Change-Id: I56140bf865d34993a419e231aed874d3b81d4ce0
Bill Yi [Tue, 3 Jul 2018 02:27:51 +0000 (19:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
20fa188802 -s ours
Change-Id: If51e678c0621df0150bb22fbcbee9b16964b1215
TreeHugger Robot [Tue, 3 Jul 2018 02:26:16 +0000 (02:26 +0000)]
Merge "Unrestrict app if it been set as device admin app"
TreeHugger Robot [Tue, 3 Jul 2018 01:22:24 +0000 (01:22 +0000)]
Merge "Misc tweaks to Indexable usage and tests."
TreeHugger Robot [Tue, 3 Jul 2018 01:18:15 +0000 (01:18 +0000)]
Merge "Add Feature Flag for Hearing Aid Profile"
Bill Yi [Tue, 3 Jul 2018 01:11:20 +0000 (18:11 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
110524699
Change-Id: I80e63cc3fe9148fa5c6986dfc7b470e870d683ca
Lei Yu [Thu, 28 Jun 2018 21:08:42 +0000 (14:08 -0700)]
Unrestrict app if it been set as device admin app
Bug:
110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf
Kevin Chyn [Tue, 3 Jul 2018 00:51:49 +0000 (00:51 +0000)]
Merge changes from topic "face-settings"
* changes:
3/n: Remove all faces when Pin/Pattern/Pass is removed
2/n: Add face to ChooseLock*
1/n Start adding Face settings (base, intro)
Lei Yu [Thu, 28 Jun 2018 21:08:42 +0000 (14:08 -0700)]
Unrestrict app if it been set as device admin app
Fix merge conlict in imports area
Bug:
110337989
Test: RunSettingsRoboTests
Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf
Fan Zhang [Mon, 2 Jul 2018 20:44:57 +0000 (13:44 -0700)]
Misc tweaks to Indexable usage and tests.
- Make SettingsPreferenceFragment implement Indexable directly
- Add existing fragments that are SettingsPrefFragment but not Indexable
to grandfather list.
- Fix "font size" fragment so it shows up in search properly.
- Remove duplicates for "lock screen display", "Screen saver".
Bug:
70720645
Test: robotests
Change-Id: I44ce0cac0fdf5e882b315861bb4bebc45dbe01e6
Stanley Tng [Wed, 20 Jun 2018 22:32:02 +0000 (15:32 -0700)]
Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
TreeHugger Robot [Mon, 2 Jul 2018 17:21:01 +0000 (17:21 +0000)]
Merge "Revert "Revert "First commit of dynamic home page feature"""
TreeHugger Robot [Mon, 2 Jul 2018 17:15:35 +0000 (17:15 +0000)]
Merge "Use getSummary in ZenStarredContactPrefController"
TreeHugger Robot [Mon, 2 Jul 2018 16:49:16 +0000 (16:49 +0000)]
Merge "Add error handle for device that not support Bluetooth"
Beverly [Mon, 2 Jul 2018 13:42:18 +0000 (09:42 -0400)]
Use getSummary in ZenStarredContactPrefController
Change-Id: I517d959371e7dde2eafef540fe000f177c064104
Fixes:
110989450
Test: ZenModeStarredContactsPreferenceControllerTest.java
Raff Tsai [Fri, 29 Jun 2018 06:11:39 +0000 (06:11 +0000)]
Revert "Revert "First commit of dynamic home page feature""
This reverts commit
457f6ef14055d238ec6bd140d4e050f40507d59e.
Reason for revert: fix the color check in repohook
Test: make RunSettingsRoboTests
Change-Id: I1b466c412138dfb0f2bffc4270a8932fe3b81c94
Kevin Chyn [Fri, 29 Jun 2018 20:09:32 +0000 (13:09 -0700)]
3/n: Remove all faces when Pin/Pattern/Pass is removed
Bug:
110589286
Test: set up fingerprint + pass, change lock screen to swipe
no regression, fingerprints are all removed, activity is finished()
Change-Id: Ie5e586b2f9d2c982d929e5c5b80911897889e7a4
Kevin Chyn [Thu, 28 Jun 2018 21:59:38 +0000 (14:59 -0700)]
2/n: Add face to ChooseLock*
Bug:
110589286
Test: manual
Test: make -j56 RunSettingsRoboTests
Test: setting up new fingerprint still works
Change-Id: I1b7d2bb6bb417dae2c99e5abeb68d3f694cb3cb8
Kevin Chyn [Tue, 26 Jun 2018 00:58:31 +0000 (17:58 -0700)]
1/n Start adding Face settings (base, intro)
This change refactors common biometric settings code as well to minimize
duplicated code in areas such as:
Preference Controller
EnrollBase
EnrollIntro
This change also updates ChooseLock to have Face + Pin/Pattern/Pass
Bug:
110589286
Test: Fingerprint settings/enrollment still works
Test: make -j56 RunSettingsRoboTests
Change-Id: Ie35406a01b85617423beece42683ac086e9bc4a7
Hall Liu [Tue, 12 Jun 2018 22:20:50 +0000 (15:20 -0700)]
Fix usage of SubscriptionInfo ctor
Use string arguments instead of ints for mcc/mnc
Bug:
35064313
Test: manual, unit
Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a
Doris Ling [Fri, 29 Jun 2018 21:22:36 +0000 (14:22 -0700)]
Fix continous playing of gesture animation video.
In the gesture settings, we listen to surface texture updates to
determine when both the view and video is ready, and we auto play the
animation video. However, sometimes, the video listener will receive
the surface texture updates after the settings activity is being paused,
in which case, the video will continue to play until the user navigate
back to that gesture settings page.
In onSurfaceTextureUpdated(), check for view visibility before we try to
update anything to avoid unnecessary operation.
Change-Id: I46474c9f461d5705f599deb8b2535d8505f2fe75
Bug:
110923173
Test: make RunSettingsRoboTests
Jeff Sharkey [Fri, 29 Jun 2018 20:50:48 +0000 (20:50 +0000)]
Merge "Disable "internal" when adoption not possible."
TreeHugger Robot [Fri, 29 Jun 2018 01:24:49 +0000 (01:24 +0000)]
Merge "Revert "First commit of dynamic home page feature""
Lei Yu [Fri, 29 Jun 2018 00:18:14 +0000 (00:18 +0000)]
Revert "First commit of dynamic home page feature"
This reverts commit
3515bc72594137050dd8c8d13f7b19df1cc76cec.
Reason for revert: CLs in this topic break color check in repohook.
Bug:
110960820
Change-Id: I5934b6baf65515ebbc4e4660ed99747dd581f526
Lucas Dupin [Mon, 25 Jun 2018 02:22:21 +0000 (19:22 -0700)]
Move NightMode to Display settings
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DarkUIPreferenceController
Bug:
110758454
Change-Id: Ie389a0e55eb39f2b43d4e9c0739ad3f61469d740
Lucas Dupin [Mon, 25 Jun 2018 01:28:04 +0000 (01:28 +0000)]
Revert "Setting to change sysui theme"
This reverts commit
74fde3ea31c8a5acff4a8c4ee76ce9200082a736.
Reason for revert: CL was intended to be a workaround while we were still working on global theming.
Change-Id: I2c10971b9eab5382c1782c8d09c569edc35ea191
Jeff Sharkey [Thu, 28 Jun 2018 17:56:35 +0000 (11:56 -0600)]
Disable "internal" when adoption not possible.
When adoption isn't possible, we shortcut to try formatting as
external, but that still results in a warning dialog that the user
could cancel away from and then manually pick "internal."
Bug:
110863258
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I04645c3fce11a883c10996772d73440a0dcd51ec
TreeHugger Robot [Thu, 28 Jun 2018 17:03:16 +0000 (17:03 +0000)]
Merge "Add log and turn on debug flag"
hughchen [Thu, 28 Jun 2018 09:25:40 +0000 (17:25 +0800)]
Add log and turn on debug flag
Add log and turn on debug flag
Bug:
80161203
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibd57f91b83c487ee71adb9e3de7ecfc5ea66bbef
Raff Tsai [Thu, 28 Jun 2018 07:43:59 +0000 (07:43 +0000)]
Merge "First commit of dynamic home page feature"
TreeHugger Robot [Thu, 28 Jun 2018 06:38:17 +0000 (06:38 +0000)]
Merge "Fork SettingsDrawerActivity in Settings."
tmfang [Thu, 14 Jun 2018 06:48:35 +0000 (14:48 +0800)]
Fork SettingsDrawerActivity in Settings.
Settings app uses fragment classes from android framework,
which is deprecated as of P.
We need to switch to use fragment and associated classes to androidx.
Because Settings didn't support drawer feature since Android O,
we rename SettingsDrawerActivity to SettingsBaseActivity.
Before we migrate to fragment of androix,
we need to let SettingsBaseActivity extend FragmentActivity.
Test: make RunSettingsRoboTests
Bug:
110259478
Change-Id: Ifbf53f75f042da1618da16cf7837b70d298a9a14
Fan Zhang [Thu, 28 Jun 2018 05:10:22 +0000 (22:10 -0700)]
[automerger skipped] Delete obsolete activity alias for dev settings am:
0e1393ae8c am:
afbdbeb7d5 am:
192cc156b0 -s ours am:
e9b64753e7 -s ours
am:
37f143d601 -s ours
Change-Id: Ie59e9639e1d231002a1348433d3cb6001f15532c
Fan Zhang [Thu, 28 Jun 2018 05:07:14 +0000 (22:07 -0700)]
[automerger skipped] Delete obsolete activity alias for dev settings am:
0e1393ae8c am:
afbdbeb7d5 am:
192cc156b0 -s ours
am:
e9b64753e7 -s ours
Change-Id: Ida92ee646fe101c1c886fecc9351257435571d39
Fan Zhang [Thu, 28 Jun 2018 05:01:57 +0000 (22:01 -0700)]
[automerger skipped] Delete obsolete activity alias for dev settings am:
0e1393ae8c am:
afbdbeb7d5
am:
192cc156b0 -s ours
Change-Id: Ib02c4b16500eaf479106c2e70b02fdaa401141e7
Fan Zhang [Thu, 28 Jun 2018 04:56:41 +0000 (21:56 -0700)]
Delete obsolete activity alias for dev settings am:
0e1393ae8c
am:
afbdbeb7d5
Change-Id: I0bbd3a65b7f1ab11e0f182ca4421c8c5911e6ad2
Fan Zhang [Thu, 28 Jun 2018 04:53:33 +0000 (21:53 -0700)]
Delete obsolete activity alias for dev settings
am:
0e1393ae8c
Change-Id: I879550b9dda19f42aec9d5cecc4f66a5ad0c23e4
hughchen [Mon, 25 Jun 2018 03:06:45 +0000 (11:06 +0800)]
Add error handle for device that not support Bluetooth
- Add LocalBluetoothManager null check for device that
not support Bluetooth
- Add test to verify when LocalBluetoothManager is null
will not crash
Bug:
110712414
Test: make -j42 RunSettingsRoboTests
Change-Id: Ib506a0206cfcfdfec60bdfcf9a1944338a7ab729
Raff Tsai [Tue, 19 Jun 2018 09:25:31 +0000 (17:25 +0800)]
First commit of dynamic home page feature
- Add SettingsHomepageActivity
- Add feature flag
- Use com.google.android.material_material library
Change-Id: I325be249f739d3b03dc2f0d722319f5771e2313b
Kevin Chyn [Wed, 27 Jun 2018 22:11:48 +0000 (22:11 +0000)]
Merge "Move Fingerprint settings to biometrics/fingerprint"