OSDN Git Service
Lei Yu [Fri, 15 Jun 2018 17:34:02 +0000 (17:34 +0000)]
Merge "Disable two test files"
jackqdyulei [Fri, 15 Jun 2018 17:24:32 +0000 (10:24 -0700)]
Disable two test files
They are broken in master because of change in framework. First disable
them to unblock the master.
Bug:
110263693
Test: RunSettingsRoboTests
Change-Id: I487129c905b070a5a968fd2b677218909e1afda4
Doris Ling [Fri, 15 Jun 2018 17:03:58 +0000 (17:03 +0000)]
Merge "Move clear instant app dialog logic out of AppInfoDashboardFragment."
TreeHugger Robot [Fri, 15 Jun 2018 06:50:30 +0000 (06:50 +0000)]
Merge "Apply the correct theme to DockPreference"
Doris Ling [Thu, 14 Jun 2018 21:58:52 +0000 (14:58 -0700)]
Move clear instant app dialog logic out of AppInfoDashboardFragment.
- refactor AppInfoDashboardFragment and move the clear instant app dialog
handling into instant app button controller.
- move the dialog fragment to be a stand-alone class instead of inner
class.
Change-Id: I51c045938f3fd1db73b4b9f7e0311a51df599a29
Fixes:
110102457
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 14 Jun 2018 22:27:39 +0000 (22:27 +0000)]
Merge "Clean up: move speciall access stuff into single package"
TreeHugger Robot [Thu, 14 Jun 2018 20:37:31 +0000 (20:37 +0000)]
Merge "Fix incorrect default browser summary."
TreeHugger Robot [Thu, 14 Jun 2018 19:58:22 +0000 (19:58 +0000)]
Merge "Turn on DataUsageSummaryActivity"
TreeHugger Robot [Thu, 14 Jun 2018 19:51:28 +0000 (19:51 +0000)]
Merge "Change display size preview for app icons."
Beverly [Thu, 14 Jun 2018 19:43:26 +0000 (12:43 -0700)]
Add help uri for prevent ringing gesture am:
55dfd8a86b
am:
4ff9758072
Change-Id: Iafb7d0299378ccb4acc13b94904f9bb8ad1fcc41
Fan Zhang [Thu, 14 Jun 2018 18:14:02 +0000 (11:14 -0700)]
Clean up: move speciall access stuff into single package
Bug:
110207366
Test: robotests
Change-Id: I17ad7a15d1e44bb7690d2b18ed6e2b6b17b46d8a
Android Build Merger (Role) [Thu, 14 Jun 2018 19:32:34 +0000 (19:32 +0000)]
[automerger] Add help uri for prevent ringing gesture am:
55dfd8a86b am:
77f338e15c
Change-Id: I97879ad48f3a20ad5a93986ee165f509320e3925
Beverly [Thu, 14 Jun 2018 19:32:06 +0000 (12:32 -0700)]
Add help uri for prevent ringing gesture
am:
55dfd8a86b
Change-Id: I0fa7f6c564166c55da386c5492b694fc853db1ca
Beverly [Thu, 14 Jun 2018 19:28:08 +0000 (12:28 -0700)]
Add help uri for prevent ringing gesture
am:
55dfd8a86b
Change-Id: Id9d2738a9225e6b655f027a25024cd25acbd091a
TreeHugger Robot [Thu, 14 Jun 2018 19:10:37 +0000 (19:10 +0000)]
Merge "Update battery saver seekbar"
TreeHugger Robot [Thu, 14 Jun 2018 18:28:18 +0000 (18:28 +0000)]
Merge "Use FIELD_ANOMALY_TYPE instead of FIELD_CONTEXT"
Doris Ling [Thu, 14 Jun 2018 18:26:40 +0000 (11:26 -0700)]
Fix incorrect default browser summary.
- move the logic to retrieve browser candidates with unique package name
from default browser picker to the controller, so that both uses the
same logic to get the candidate list. When there is only 1 package that
can handle the web but it has multiple resolved activities, it should
be considered as the only app, and hence be set as default.
Change-Id: I945bcef3f7de586b19f65ceada3abf7addb0b26e
Fixes:
109882811
Test: make RunSettingsRoboTests
Fan Zhang [Thu, 14 Jun 2018 17:37:45 +0000 (10:37 -0700)]
Turn on DataUsageSummaryActivity
Test: rebuild
Change-Id: I984c751b2be00b514740a3121ac2f73b277aa139
Fan Zhang [Thu, 14 Jun 2018 17:25:58 +0000 (10:25 -0700)]
Change display size preview for app icons.
The new UI intentionally does not look like the app drawer from
launcher so user is clear this is a preview screen.
Change-Id: Iba87fab72e77921c1f1014fca24476bd4af2d19c
Fixes:
70043399
Test: visual
Doris Ling [Thu, 14 Jun 2018 17:11:54 +0000 (17:11 +0000)]
Merge "Do not turn on NFC automatically when airplane mode is off."
TreeHugger Robot [Thu, 14 Jun 2018 17:06:43 +0000 (17:06 +0000)]
Merge "Remove reference to preference_category_material_settings"
TreeHugger Robot [Thu, 14 Jun 2018 03:09:20 +0000 (03:09 +0000)]
Merge "Increase the character limit"
TreeHugger Robot [Thu, 14 Jun 2018 02:35:28 +0000 (02:35 +0000)]
Merge "Usage graphs support RTL style."
Android Build Merger (Role) [Thu, 14 Jun 2018 00:25:56 +0000 (00:25 +0000)]
Merge "[automerger skipped] Merge "Remove internal ApnSetting." am:
4079677883 am:
1fc6859126 -s ours am:
5b255c9cbc -s ours"
TreeHugger Robot [Thu, 14 Jun 2018 00:25:15 +0000 (00:25 +0000)]
Merge "Fix crash in ChooseLockGenericFragment."
Pengquan Meng [Thu, 14 Jun 2018 00:24:31 +0000 (17:24 -0700)]
[automerger skipped] Merge "Remove internal ApnSetting." am:
4079677883 am:
1fc6859126 -s ours
am:
5b255c9cbc -s ours
Change-Id: I84b1b8f943e55a151c25616a766445eb6bb2e5a2
TreeHugger Robot [Wed, 13 Jun 2018 23:37:42 +0000 (23:37 +0000)]
Merge "Added Keywords for Device Theme"
Pengquan Meng [Wed, 13 Jun 2018 23:19:25 +0000 (16:19 -0700)]
[automerger skipped] Merge "Remove internal ApnSetting." am:
4079677883
am:
1fc6859126 -s ours
Change-Id: Ic6772c2b65d98c78863c5e9b60e7c1ac1cc714cb
Pengquan Meng [Wed, 13 Jun 2018 22:33:56 +0000 (15:33 -0700)]
Merge "Remove internal ApnSetting."
am:
4079677883
Change-Id: I130a2038c2c5b289c107d9e640c038965ef60e34
jackqdyulei [Wed, 13 Jun 2018 21:45:16 +0000 (14:45 -0700)]
Update battery saver seekbar
This CL adds ticks to seekbar to make it increase by 5% or multiple of
it.
Change-Id: I25a592d75a32adaddccb4b5a7c7f18a0f771d99a
Fixes:
73763634
Test: RunSettingsRoboTests
Android Build Merger (Role) [Wed, 13 Jun 2018 21:38:58 +0000 (21:38 +0000)]
[automerger] Change UI for wireless AP tether band selection am:
acff57fa68 am:
389368a241
Change-Id: I1a9420f23fe2823d135b2e16f936bc97e41b6487
Salvador Martinez [Wed, 13 Jun 2018 21:38:42 +0000 (14:38 -0700)]
Change UI for wireless AP tether band selection
am:
acff57fa68
Change-Id: I2b6d82bc9338969cd2d05bf995d89c51c1d7f069
Android Build Merger (Role) [Wed, 13 Jun 2018 21:38:01 +0000 (21:38 +0000)]
[automerger skipped] Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev am:
5cb6b79400 skipped:
22df4f43a5
Change-Id: I748adb663cdf251edffce05268813cf9e1f79a44
Artem Iglikov [Wed, 13 Jun 2018 21:37:40 +0000 (14:37 -0700)]
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
am:
5cb6b79400
Change-Id: I45f7f696e439daf826e717cc1c722237a3eec0c5
Android Build Merger (Role) [Wed, 13 Jun 2018 21:36:42 +0000 (21:36 +0000)]
[automerger skipped] Merge "Fix gray out previously connected device preference issue" into pi-dev am:
2ffa711cd1 -s ours skipped:
3a5859779a
Change-Id: I7bfd420524778f682d1836ca21c49361e5330ae7
Ivan Chiang [Wed, 13 Jun 2018 21:36:14 +0000 (14:36 -0700)]
[automerger skipped] Merge "Fix gray out previously connected device preference issue" into pi-dev
am:
2ffa711cd1 -s ours
Change-Id: I7df1d799566f9cfef1a94fdc98c2b43c978b1752
Pengquan Meng [Wed, 13 Jun 2018 20:47:13 +0000 (20:47 +0000)]
Merge "Remove internal ApnSetting."
Doris Ling [Thu, 31 May 2018 21:56:28 +0000 (14:56 -0700)]
Do not turn on NFC automatically when airplane mode is off.
- besides checking the value for AIRPLANE_MODE_TOGGLEABLE_RADIOS, also
check the value for AIRPLANE_MODE_RADIOS to determine if we should turn
off NFC when airplane mode is on.
- when user turns off airplane mode, only re-enable the NFC preference
and do not enable NFC by default.
- remove listening to airplane mode directly from the android beam
preference controller, as it is already listening to Nfc state, which
handles the beam state already.
Change-Id: Id41fef15fb2de873729d20d7f53b1a88b164cf95
Fixes:
80217047
Test: make RunSettingsRoboTests
jackqdyulei [Wed, 13 Jun 2018 20:14:46 +0000 (13:14 -0700)]
Use FIELD_ANOMALY_TYPE instead of FIELD_CONTEXT
We did it for general anomaly however not the whitelisted one. This
CL fixes it.
Change-Id: I6603ffbaf1d097b360c86406ae0675bfe8a20410
Fixes:
109804858
Test: RunSettingsRoboTests
TreeHugger Robot [Wed, 13 Jun 2018 18:10:24 +0000 (18:10 +0000)]
Merge "Fix back stack didn't perserved when Files Activity launched by Setting storage then back case."
Andre Garivay [Tue, 12 Jun 2018 22:43:35 +0000 (15:43 -0700)]
Added Keywords for Device Theme
Added 'dark theme' as keyword for Device Theme setting.
Change-Id: Ib7b1d322f3451c6502d9d8c3cf28eb56bae08e58
Fixes:
110103985
Test: UI
Antony Sargent [Mon, 11 Jun 2018 21:30:09 +0000 (14:30 -0700)]
Remove reference to preference_category_material_settings
This layout in settingslib has been migrated to the support library's
preference_category_material, so we can just reference that.
Bug:
110037570
Test: manual (format of category headers should look normal in Settings
timezone picker)
Change-Id: I32df326e1d4afd4d7ae6f694c38554f3d0f54e84
Beverly [Thu, 7 Jun 2018 14:43:32 +0000 (10:43 -0400)]
Add help uri for prevent ringing gesture
Test: build
Bug:
79270169
Change-Id: Iea5598f26649854521202363cad6ee297cef3057
(cherry picked from commit
486d1facfab222c686e03c344619aaf19280ea2a)
yuemingw [Wed, 13 Jun 2018 12:33:59 +0000 (13:33 +0100)]
Remove internal ApnSetting.
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.
Bug:
77511388
Test: existing test
Change-Id: Idb66b7af22c0531d4ffc324075849abc08667a87
Merged-In: I8ca1fb399026a8ef4ba9afa18678d986daa50606
Ivan Chiang [Tue, 12 Jun 2018 05:46:13 +0000 (13:46 +0800)]
Apply the correct theme to DockPreference
Set the preference context to apply correct theme to preference.
Bug:
110016611
Test: m -j SettingsRoboTests RunSettingsRoboTests
Change-Id: Ifb680fdc0ff40f86886f91320b4187e9873efbf4
hughchen [Wed, 13 Jun 2018 03:09:41 +0000 (11:09 +0800)]
Increase the character limit
Increase the character limit to "CHAR LIMIT=NONE" for linguist request,
the "CHAR LIMIT=30" is not enough for translated.
Bug:
110086224
Test: Build pass
Change-Id: Ie6ffe96d94b1fd4ea1137d2b956ff1a6711a103a
Salvador Martinez [Wed, 13 Jun 2018 01:00:12 +0000 (18:00 -0700)]
[automerger skipped] Change UI for wireless AP tether band selection am:
acff57fa68
am:
31a33ba6b6 -s ours
Change-Id: Ied6d51a306ac9b7442ee482d16d1ed31f0007b3d
Salvador Martinez [Wed, 13 Jun 2018 00:15:51 +0000 (17:15 -0700)]
Change UI for wireless AP tether band selection
am:
acff57fa68
Change-Id: I47124f2fa50015eca97cee589b4a1f94f43123fd
Doris Ling [Tue, 12 Jun 2018 23:33:05 +0000 (16:33 -0700)]
Fix crash in ChooseLockGenericFragment.
- in onActivityResult(), the intent data can be null. Check for non null
intent data before trying to read the extra string from the intent.
Change-Id: I14c42725a7885a84688ae39fde63e30ad0536001
Fixes:
109675331
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 12 Jun 2018 23:32:26 +0000 (23:32 +0000)]
Merge "Add padding between battery text and icon"
Salvador Martinez [Wed, 30 May 2018 00:53:02 +0000 (17:53 -0700)]
Change UI for wireless AP tether band selection
We decided to use the list preference after all due to
some devices not supporting various combinations of AP
configurations. This change makes it so that there are
three different UIs depending on the configurations
which are supported.
- 5.0 GHz unsupported: disable the preference and just
set the value to 2.4 GHz
- all supported, no dual mode: allow the user to choose
EITHER 2.4 GHz or 5.0 GHz
- all supported, dual mode: allow the user to choose
2.4 GHz or BOTH 2.4 GHz & 5.0 GHz with 5.0 being
preferred
Test: atest SettingsRoboTests
Bug:
80315296
Change-Id: I888d35811a98b8cf0155a3cb96c42ff762763378
Merged-In: I888d35811a98b8cf0155a3cb96c42ff762763378
yuemingw [Tue, 12 Jun 2018 22:55:42 +0000 (15:55 -0700)]
Remove internal ApnSetting.
am:
ff73564ea0
Change-Id: I8faf14404a5e59f598cc531a776b53471cb17fce
TreeHugger Robot [Tue, 12 Jun 2018 22:44:54 +0000 (22:44 +0000)]
Merge "Consolidate the 2 app button prefernece controllers."
TreeHugger Robot [Tue, 12 Jun 2018 21:58:33 +0000 (21:58 +0000)]
Merge "Hide quicksetting tile for dev options when it's turned off"
Doris Ling [Mon, 11 Jun 2018 22:11:44 +0000 (15:11 -0700)]
Consolidate the 2 app button prefernece controllers.
- move the fuelgauge app button controller and the button dialog
fragment into app info package and change app detail fragment to use
that controller instead.
- remove the original appinfo/AppActionButtonPreferenceController
Change-Id: I94ca072a8dfe6051853eb23efa1f96ac3e13d79d
Fixes:
80312809
Test: make RunSettingsRoboTests
Fan Zhang [Tue, 12 Jun 2018 19:06:17 +0000 (12:06 -0700)]
Hide quicksetting tile for dev options when it's turned off
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes:
78652607
Test: robotests
TreeHugger Robot [Tue, 12 Jun 2018 17:03:12 +0000 (17:03 +0000)]
Merge "To show hearing aids device in the available devices group"
Irina Dumitrescu [Fri, 8 Jun 2018 18:26:25 +0000 (19:26 +0100)]
Clean up KeyStore exception warning caused by adding a new VPN.
Bug:
109791294
Test: manually navigate to settings and click the + button in VPN.
Change-Id: Ib94778ef3fdab0fc8147477b91f644c54dc04c24
yuemingw [Mon, 9 Apr 2018 16:00:38 +0000 (17:00 +0100)]
Remove internal ApnSetting.
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.
Bug:
77511388
Test: existing test
Change-Id: I8ca1fb399026a8ef4ba9afa18678d986daa50606
Artem Iglikov [Tue, 12 Jun 2018 13:37:39 +0000 (06:37 -0700)]
[automerger skipped] Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev am:
5cb6b79400
am:
270c692e7f -s ours
Change-Id: I7fe330c63ac16dd515782135e8d7b6f51151ee78
Artem Iglikov [Tue, 12 Jun 2018 13:35:19 +0000 (06:35 -0700)]
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
am:
5cb6b79400
Change-Id: I6c958dc1d0c4d87eeafe1855da6455f4185597da
TreeHugger Robot [Tue, 12 Jun 2018 12:47:36 +0000 (12:47 +0000)]
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
Artem Iglikov [Tue, 12 Jun 2018 11:40:24 +0000 (11:40 +0000)]
DO NOT MERGE Revert "Fix gray out previously connected device preference issue"
This reverts commit
95abf59af43bafe4922b8cc096b10b65440419b8.
Reason for revert: Crashes settings (b/
110075201)
Bug:
110075201
Change-Id: Ie6ea94e0891754f18576bd21447b64410d2fd23a
Ivan Chiang [Tue, 12 Jun 2018 11:04:27 +0000 (04:04 -0700)]
[automerger skipped] Merge "Fix gray out previously connected device preference issue" into pi-dev am:
2ffa711cd1
am:
d718f4bb8b -s ours
Change-Id: Ie6c4a274fae210ca72ed746d430b863a85dca2c7
timhypeng [Fri, 25 May 2018 06:01:02 +0000 (14:01 +0800)]
To show hearing aids device in the available devices group
Bug:
79553082
Test: make -j50 RunSettingsRoboTests
Change-Id: I8fe5eb653d332ef5ac4a566146f150774581167c
Ivan Chiang [Tue, 12 Jun 2018 08:20:56 +0000 (01:20 -0700)]
Merge "Fix gray out previously connected device preference issue" into pi-dev
am:
2ffa711cd1
Change-Id: Id889619b77d10826ad0c0eefe494b7aea3a4d779
TreeHugger Robot [Tue, 12 Jun 2018 07:34:15 +0000 (07:34 +0000)]
Merge "Fix gray out previously connected device preference issue" into pi-dev
Leo Hsu [Fri, 20 Apr 2018 02:40:08 +0000 (10:40 +0800)]
Usage graphs support RTL style.
Flips the canvas horizontally before drawing paths under RTL mode.
Bug:
78008951
Test: manually verified graphs of wifi data usage, app data usage, and
battery usage.
Change-Id: I79286e9f3f98632e3a9710d42c3e197231a14c39
lumark [Mon, 11 Jun 2018 07:20:39 +0000 (15:20 +0800)]
Fix back stack didn't perserved when Files Activity launched by Setting storage then back case.
Due to FilesActivity set "android:documentLaunchMode="intoExisting", it will create
new task when launched from Storage Setting page.
When select FilesActivity task from recents & press back key, it will not back
to settings page.
Using startActivityForResult to set task as source task can fix task separated case.
Change-Id: I26362928261a1a9c0e485a486be493423d1fcf61
Fixes:
33117269
Test: Manual
Test: atest StorageItemPreferenceControllerTest
TreeHugger Robot [Tue, 12 Jun 2018 01:01:32 +0000 (01:01 +0000)]
Merge "Misc clean up. move widgets from graph to widget package."
TreeHugger Robot [Tue, 12 Jun 2018 00:50:27 +0000 (00:50 +0000)]
Merge "Suppress "see all" from settings search."
TreeHugger Robot [Mon, 11 Jun 2018 23:59:18 +0000 (23:59 +0000)]
Merge "Add a switchbar to turn off multi-user feature entirely"
Fan Zhang [Mon, 11 Jun 2018 23:00:09 +0000 (16:00 -0700)]
Misc clean up. move widgets from graph to widget package.
Bug: n/a
Test: robotests, rebuild
Change-Id: I910f355312d52e81a0bf57b46a3f267e1eb9882a
TreeHugger Robot [Mon, 11 Jun 2018 22:51:13 +0000 (22:51 +0000)]
Merge "Remove DataSummaryUsageLegacy."
Fan Zhang [Mon, 11 Jun 2018 22:35:03 +0000 (15:35 -0700)]
Suppress "see all" from settings search.
Bug:
109894919
Test: reindex search
Change-Id: I009c5d2f366af402dcbfd2eb75b56bfcbb9217a6
Fan Zhang [Tue, 5 Jun 2018 22:36:40 +0000 (15:36 -0700)]
Add a switchbar to turn off multi-user feature entirely
Change-Id: Ibf88bf37899af5065c68aeb2337acd4ee48bc13c
Fixes:
72319180
Test: robotest on new controller. Manual test on UserSettings fragment.
jackqdyulei [Mon, 11 Jun 2018 21:12:13 +0000 (14:12 -0700)]
Add padding between battery text and icon
Change-Id: I4625ae6168278f7e69e9e26ed9c12958645e920e
Fixes:
80281413
Test: Screenshot
TreeHugger Robot [Mon, 11 Jun 2018 20:53:33 +0000 (20:53 +0000)]
Merge "Handle usageevents for work profile apps"
Fan Zhang [Mon, 11 Jun 2018 19:26:03 +0000 (12:26 -0700)]
Skip device index job if caller is not Settings app. am:
9ecf3e0c11
am:
251c324646
Change-Id: I67ae2371016f8c143bdbbf180ac09b9968c16c7d
Fan Zhang [Mon, 11 Jun 2018 18:40:07 +0000 (11:40 -0700)]
Skip device index job if caller is not Settings app.
am:
9ecf3e0c11
Change-Id: I84974379ac3074367623cce60d6633fd4390ed00
Fan Zhang [Mon, 11 Jun 2018 18:39:06 +0000 (11:39 -0700)]
Skip device index job if caller is not Settings app.
am:
9ecf3e0c11
Change-Id: Id9632b11fb123e9fe2dc7b1878ce469f0e0a9dd9
Julia Reynolds [Mon, 21 May 2018 18:17:26 +0000 (14:17 -0400)]
Handle usageevents for work profile apps
Test: robotests
Change-Id: Ifdc6e456d76614220b2052e6ca8a8f3676d0e2ee
Fixes:
79142791
Fan Zhang [Mon, 11 Jun 2018 16:28:02 +0000 (09:28 -0700)]
Remove DataSummaryUsageLegacy.
Change-Id: I8da039530cafe547008b434b6016add5f9383e94
Fixes:
109943959
Test: robotest/atest
TreeHugger Robot [Mon, 11 Jun 2018 18:05:32 +0000 (18:05 +0000)]
Merge "Remove references to SettingsBase styles"
Fan Zhang [Wed, 30 May 2018 16:50:52 +0000 (09:50 -0700)]
Skip device index job if caller is not Settings app.
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes:
80437512
Fixes:
109713077
Test: robotests
(cherry picked from commit
74ba1a51d74a4fb7fc2ccd62fd38087974c20020)
Beverly [Thu, 7 Jun 2018 14:43:47 +0000 (10:43 -0400)]
Add summary to PreventRingingParent
Parent preference previously didn't have a summary
Moved summary test to PreventRingingParentPreferenceControllerTest
Test: PreventRingingParentPreferenceControllerTest.java
Change-Id: I2891e1ccffc4ea8007c8bd25689f242ee34c652c
TreeHugger Robot [Mon, 11 Jun 2018 03:39:19 +0000 (03:39 +0000)]
Merge "Change the string"
Xin Li [Sat, 9 Jun 2018 13:52:22 +0000 (06:52 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am:
44de687b93
am:
5a0817ce57
Change-Id: I872c4eb99d693c48a174cbd98231c75af199ed79
Xin Li [Sat, 9 Jun 2018 10:23:12 +0000 (03:23 -0700)]
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am:
44de687b93
Change-Id: I9aca24c1ee7a0ce46d8a7845ba78735fd03410c7
TreeHugger Robot [Sat, 9 Jun 2018 01:23:26 +0000 (01:23 +0000)]
Merge "Check EnforcedAdmin to see if location is locked down by device policy."
TreeHugger Robot [Fri, 8 Jun 2018 23:01:04 +0000 (23:01 +0000)]
Merge "Misc search clean up"
Fan Zhang [Fri, 8 Jun 2018 21:32:04 +0000 (14:32 -0700)]
Misc search clean up
- Make color mode page searchable and suppress its parent page.
- Suppress entire DataUsageSummaryLegacy page in search. This page will
be deleted soon
Change-Id: I0f98c9073358934b98e986d034c89a9bf87e58ad
Fixes:
70720645
Test: robotests
TreeHugger Robot [Fri, 8 Jun 2018 21:37:26 +0000 (21:37 +0000)]
Merge "Check wifi password length by byte, not char."
TreeHugger Robot [Fri, 8 Jun 2018 21:07:30 +0000 (21:07 +0000)]
Merge "Fix memory leaks in Settings"
TreeHugger Robot [Fri, 8 Jun 2018 20:50:00 +0000 (20:50 +0000)]
Merge "Avoids systemui color tint flicker because no system ui flags set"
Antony Sargent [Tue, 5 Jun 2018 21:31:32 +0000 (14:31 -0700)]
Remove references to SettingsBase styles
We've moved the values for several preference-related styles used in
Settings from SettingsLib into the support library. This CL removes the
references to the SettingsLib versions from Settings so they can be
removed from SettingsLib.
Also delete an unused layout file that was moved to SettingsLib a long
time ago (preference_dropdown_material_settings.xml).
Bug:
64689839
Test: visual (styles for things like icon spacing, dividers, etc. should
be the same)
Change-Id: Ib7a745218086269c2e861b18df68bd835929da19
Fan Zhang [Fri, 8 Jun 2018 20:18:07 +0000 (13:18 -0700)]
Check wifi password length by byte, not char.
Change-Id: Ie6dc441780660c52ff01a2bced79a4e95200d731
Fixes:
79209073
Test: robotest
TreeHugger Robot [Fri, 8 Jun 2018 19:07:22 +0000 (19:07 +0000)]
Merge "Don't crash if IMEI is empty"
Fan Zhang [Thu, 7 Jun 2018 18:33:48 +0000 (11:33 -0700)]
Fix memory leaks in Settings
Bug:
80507279
Test: inspected hprof before and after fix
Change-Id: I6ea2925695deb6261263649e858484e1667ec522
Beverly [Fri, 8 Jun 2018 18:47:07 +0000 (11:47 -0700)]
Merge "Fix typo" into pi-dev am:
29eec443e0
am:
a045b13e0a
Change-Id: Iccf8130b9740faf66c8b05189ff0d0b13aebe5fe