OSDN Git Service
SongFerngWang [Thu, 19 Dec 2019 17:01:34 +0000 (01:01 +0800)]
Phone Info UI shows network type list which depends on RAT supported
Phone Info UI shows preferred network type list which depends on
device RAT supported. If device is 5G supported, UI shows 5G list.
If device is not 5G supported, UI shows LTE list.
Bug:
146504601
Test: 1.Build pass.
2. go to Phone Info UI, and set preferred network type (PASS)
Change-Id: I079d40b4ed593dd6629caf96ca8a94aaf69e9f04
Merged-In: Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c
Merged-In: Id62a2bf4b2c44efcd48319734d1cab6ed969ee06
Kevin Chyn [Wed, 18 Dec 2019 06:15:58 +0000 (06:15 +0000)]
Merge "Added horizontal seperator in Face Settings" into qt-qpr1-dev
joshmccloskey [Wed, 16 Oct 2019 00:53:13 +0000 (17:53 -0700)]
Added horizontal seperator in Face Settings
Test: Manual.
Bug:
140965037
Change-Id: I05bfa9b1826c5d4dfcbba6cbe2d2e320014950e3
Merged-In: I05bfa9b1826c5d4dfcbba6cbe2d2e320014950e3
TreeHugger Robot [Wed, 18 Dec 2019 02:27:28 +0000 (02:27 +0000)]
Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev
Kevin Chyn [Tue, 17 Dec 2019 05:27:01 +0000 (05:27 +0000)]
Merge "Add feature provider for face unlock" into qt-qpr1-dev
Kevin Chyn [Mon, 16 Dec 2019 22:26:49 +0000 (14:26 -0800)]
Add feature provider for face unlock
Bug:
146085546
Test: Builds
Change-Id: If5c7d57c12a3f679d81cee22fb94a53fce1de29a
Alex Lin [Mon, 16 Dec 2019 21:34:45 +0000 (21:34 +0000)]
Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev
Bill Yi [Sat, 14 Dec 2019 05:28:00 +0000 (21:28 -0800)]
Import translations. DO NOT MERGE
Change-Id: I97d06e305b91ed0cffb8282e2610711d6c4d1d38
Auto-generated-cl: translation import
Jay Aliomer [Thu, 12 Dec 2019 20:32:01 +0000 (20:32 +0000)]
Merge "Dark theme settings activity" into qt-qpr1-dev
Raff Tsai [Thu, 12 Dec 2019 07:14:34 +0000 (15:14 +0800)]
Fix Settings crash when clicks Notifications
- FaceSettingsLockscreenBypassPreferenceController's preference key
is different from that in xml. Use DashboardFragment generic way to
create PreferenceController which bind the preference key defined in
xml.
- Also refine the way of fixing b/
140878309
Fixes:
145893081
Test: manual check FaceSettings and Notification Settings
Change-Id: Ia80e755e3f86b44e771b0cf80c9bf53a8ef8f430
Automerger Merge Worker [Thu, 12 Dec 2019 01:54:14 +0000 (01:54 +0000)]
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am:
3c6a3011fa -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
ad2502a91a is in history am:
f35dfbcdc0 -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
ad2502a91a is in history am:
473b52cd6e -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
ad2502a91a is in history am:
4a87e89929 -s ours
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
ad2502a91a is in history
Change-Id: I6d95ab64f114ac818161c903e86cc7da70b424ad
Automerger Merge Worker [Thu, 12 Dec 2019 01:54:01 +0000 (01:54 +0000)]
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am:
ad2502a91a -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
a545a85f9d is in history am:
8806cfe4fc -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
a545a85f9d is in history am:
b6c6ab51f9 -s ours
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
a545a85f9d is in history
Change-Id: I1c9606ee574e02be25134e547e5f7943bcea744b
Automerger Merge Worker [Thu, 12 Dec 2019 01:37:07 +0000 (01:37 +0000)]
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am:
3c6a3011fa -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
ad2502a91a is in history am:
f35dfbcdc0 -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
ad2502a91a is in history am:
473b52cd6e -s ours
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
ad2502a91a is in history
Change-Id: I60d91e324136beb7edec8d0fe9faf8937c8f9e3f
Automerger Merge Worker [Thu, 12 Dec 2019 01:36:39 +0000 (01:36 +0000)]
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am:
ad2502a91a -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
a545a85f9d is in history am:
8806cfe4fc -s ours
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
a545a85f9d is in history
Change-Id: I4d68617158d79e44406f2b4a1de554fb0b1c610a
Automerger Merge Worker [Thu, 12 Dec 2019 01:19:43 +0000 (01:19 +0000)]
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am:
3c6a3011fa -s ours am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
ad2502a91a is in history am:
f35dfbcdc0 -s ours
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
ad2502a91a is in history
Change-Id: I80eb8a460114a01a025a7512112c022e2568b64e
Automerger Merge Worker [Thu, 12 Dec 2019 01:19:22 +0000 (01:19 +0000)]
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am:
ad2502a91a -s ours
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
a545a85f9d is in history
Change-Id: I20f8b8521a7ada8e0f05edcee4df1e3ab87650b0
Automerger Merge Worker [Thu, 12 Dec 2019 01:18:55 +0000 (01:18 +0000)]
[automerger skipped] Prevent accounts page directly opening in screen pinning mode am:
3c6a3011fa -s ours
am skip reason: Change-Id If26eda408a9ef6fa03ad82e5bee51bb7185950d6 with SHA-1
ad2502a91a is in history
Change-Id: I4203109df4dcbd952e0ee09bc70ccd5d38ccc159
Jay Aliomer [Tue, 10 Dec 2019 19:49:27 +0000 (14:49 -0500)]
Dark theme settings activity
Dark theme settings is now launchable as an activity
Test: launch activity android.settings.DARK_THEME_SETTINGS
Fixes:
145560830
Change-Id: I24b8d3211e9d6e7a5b1f226001882573ae7fb311
Automerger Merge Worker [Wed, 11 Dec 2019 06:51:34 +0000 (06:51 +0000)]
Prevent accounts page directly opening in screen pinning mode am:
a545a85f9d am:
fd45c98d53
Change-Id: Id48f14bb8258d615dc2fe9e552640ab06aa528ab
Automerger Merge Worker [Wed, 11 Dec 2019 06:32:39 +0000 (06:32 +0000)]
Prevent accounts page directly opening in screen pinning mode am:
a545a85f9d
Change-Id: If2d4c0acb794a9a506b7611fa2f622c90054b393
Alex Lin [Thu, 21 Nov 2019 00:32:50 +0000 (16:32 -0800)]
[DO NOT MERGE] Add country blacklist support
Adding a country blacklist, except for pixel2(walleye, taimen) will still uses whitelist
Bug:
144702079
Test: manually tested
Change-Id: Ic03abd0d2706b7bb9fdc56be7906411b731b186b
Arc Wang [Mon, 9 Dec 2019 11:19:46 +0000 (19:19 +0800)]
[Wi-Fi] Fix transition mode problems
Replace SECURITY_PSK_SAE_TRANSITION & SECURITY_OWE_TRANSITION with
AccessPpoint#isPskSaeTransitionMode() &
AccessPpoint#isPskOweTransitionMode()
Bug:
144320676
Bug:
144320649
Bug:
144325162
Bug:
144321574
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: I6596c48ea54adcaf579682634965c379c7938895
Merged-In: Ic3c7ac1238a51b6e215ed63761720d2bc371d012
Mill Chen [Tue, 16 Jul 2019 09:45:46 +0000 (17:45 +0800)]
Prevent accounts page directly opening in screen pinning mode
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.
Bug:
137015265
Bug:
135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit
f3242dab3546c019d4b79c502f7b8850d36123a5)
Mill Chen [Tue, 16 Jul 2019 09:45:46 +0000 (17:45 +0800)]
Prevent accounts page directly opening in screen pinning mode
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.
Bug:
137015265
Bug:
135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit
f3242dab3546c019d4b79c502f7b8850d36123a5)
Mill Chen [Tue, 16 Jul 2019 09:45:46 +0000 (17:45 +0800)]
Prevent accounts page directly opening in screen pinning mode
In Settings there is no auth mechanism to prevent accounts page being
opened in screen pinning mode. This CL makes it so that when users are
trying to navigate to any pages in Settings from other apps in screen
pinning mode, Settings app will directly close its page.
Bug:
137015265
Bug:
135604684
Test: manual
Change-Id: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
Merged-In: If26eda408a9ef6fa03ad82e5bee51bb7185950d6
(cherry picked from commit
f3242dab3546c019d4b79c502f7b8850d36123a5)
Jay Aliomer [Sat, 7 Dec 2019 21:37:30 +0000 (16:37 -0500)]
Dark theme drop down does not show selected option
a place holder for the summary was updated in commit https://googleplex-android-review.git.corp.google.com/changes/platform%2Fpackages%2Fapps%2FSettings~
9818614/revisions/3/files/res%2Fxml%2Fdark_mode_settings.xml/download?parent=1
This change is reverted in this CL
Test: manual
Fixes:
145672617
Change-Id: I41443e7334487e3afac0343333a9ed289d2fe390
Ilya Matyukhin [Fri, 6 Dec 2019 01:58:55 +0000 (01:58 +0000)]
Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev
TreeHugger Robot [Fri, 6 Dec 2019 01:05:30 +0000 (01:05 +0000)]
Merge changes from topic "update_battery_icon" into qt-qpr1-dev
* changes:
Sync dimen from SystemUI
Battery icon is too large
TreeHugger Robot [Thu, 5 Dec 2019 18:33:31 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Thu, 5 Dec 2019 11:22:50 +0000 (03:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5889a4f6f9637d34eb5df1f844770dd68cc04e39
Auto-generated-cl: translation import
Ilya Matyukhin [Tue, 26 Nov 2019 01:01:22 +0000 (17:01 -0800)]
Fix "Skip lock screen" not working for secondary user
Bug:
140878309
Test: the option is not grayed out for secondary user.
Change-Id: I2413aa3c634e89a90d104e9ad60df15e49c75ed2
(cherry picked from commit
e17caeea3f633d60f1f8e0e2f5b8857c62f3e320)
TreeHugger Robot [Thu, 5 Dec 2019 02:49:13 +0000 (02:49 +0000)]
Merge "Always use local timezone for parsing date" into qt-qpr1-dev
Tsung-Mao Fang [Tue, 3 Dec 2019 08:57:00 +0000 (16:57 +0800)]
Always use local timezone for parsing date
Use local time zone to be in line with entry
in phonesky mainline module.
Test: Rebuild
Bug:
143357811
Change-Id: I1ecf57ec7952cff580af932e58c453622d4536f0
Jay Aliomer [Wed, 27 Nov 2019 22:46:58 +0000 (17:46 -0500)]
Battery saver mode should disable dark mode modification
disable toggle options and disable the dark theme drop down selection
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"
Fixes:
145098277
Fixes:
145297188
Fixes:
145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
timhypeng [Fri, 15 Nov 2019 04:01:26 +0000 (12:01 +0800)]
Sync dimen from SystemUI
Bug:
141139595
Test: manual
Change-Id: Ifa9a31750b9a926e09aec9262aa89e8de66c91e2
(cherry picked from commit
3dd4f2cc19f4390db253e121a24157d4169b3a7a)
Merged-In: Ifa9a31750b9a926e09aec9262aa89e8de66c91e2
timhypeng [Thu, 14 Nov 2019 02:53:32 +0000 (10:53 +0800)]
Battery icon is too large
-sync layout from SystemUI
Bug:
141139595
Test: make -j42 RunSettingsRoboTests
Change-Id: I5e165e953682fcfdebf0d06475bb1abd171684d9
(cherry picked from commit
c71f996da97a520a90afbccac4eb4d4d16435bec)
Merged-In: I5e165e953682fcfdebf0d06475bb1abd171684d9
Bill Yi [Sun, 24 Nov 2019 12:38:04 +0000 (04:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0258ef130ec225a374ae445da558755f621556d0
Auto-generated-cl: translation import
Jay Aliomer [Fri, 22 Nov 2019 22:29:43 +0000 (22:29 +0000)]
Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev
Jay Aliomer [Fri, 22 Nov 2019 14:51:08 +0000 (14:51 +0000)]
Revert "Revert "Add settings for scheduling dark theme""
This reverts commit
50c0fa136ce54dab58a0eb1dd094f9ced6e39a5e.
Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug:
141567787
Bill Yi [Fri, 22 Nov 2019 18:44:01 +0000 (10:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I64d2c2f4a3053bf7d163962d8a27929fd055b24b
Auto-generated-cl: translation import
Hai Shalom [Fri, 22 Nov 2019 03:46:02 +0000 (03:46 +0000)]
Merge "Revert submission" into qt-qpr1-dev
Hai Shalom [Thu, 21 Nov 2019 19:23:09 +0000 (19:23 +0000)]
Revert submission
Reason for revert: Incomplete fix that causes additional issues which were not anticipated earlier.
Change-Id: I65868205cc8241f8179006256e6e13698ad79d64
Merged-In: I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f
Preston O'Neal [Thu, 21 Nov 2019 22:41:18 +0000 (22:41 +0000)]
Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev
Preston O'Neal [Thu, 21 Nov 2019 22:09:53 +0000 (22:09 +0000)]
Revert "Add settings for scheduling dark theme"
This reverts commit
7141b142dfb21433d8a9465d38f6b7f714a0adbc.
Reason for revert: This is breaking builds on git_qt-qpr1-dev
Change-Id: I7766826d3fc86a12fc8411b027a52eceb5a66019
Jay Aliomer [Thu, 21 Nov 2019 21:44:41 +0000 (21:44 +0000)]
Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev
Jay Aliomer [Thu, 21 Nov 2019 15:44:57 +0000 (10:44 -0500)]
DarkUIPreferenceController null exception
The DarkUIPreferenceController doesnt need to show dialog in all cases
we added a null check for mFragment
Fixes:
144899194
Test: atest DarkUIPreferenceControllerTest
Change-Id: Ia5ed89bd46f28f4b92d955911223f9157e55c622
(cherry picked from commit
c49f266af0f834ef6db1d53fab80ab8fbfcbb382)
Jay Aliomer [Thu, 24 Oct 2019 17:42:38 +0000 (13:42 -0400)]
Add settings for scheduling dark theme
Adding a settings page similar to night light for Dark theme. it will allow the user to schedule
dark mode from sunrise to sunset
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"
Fixes:
141567787
Change-Id: I3094b655c04f59c23a95162a1be5ee8260e28a48
(cherry picked from commit
0828e6be9c0a6921b27d3e9da506ad4b7b5b14cc)
TreeHugger Robot [Tue, 19 Nov 2019 01:26:30 +0000 (01:26 +0000)]
Merge "Add a dark theme slice" into qt-qpr1-dev
Hai Shalom [Mon, 18 Nov 2019 21:29:41 +0000 (21:29 +0000)]
Merge "[WPA3] Hide connect button for cloned networks not in range" into qt-qpr1-dev
TreeHugger Robot [Sat, 16 Nov 2019 02:04:24 +0000 (02:04 +0000)]
Merge "Fix non responding slice toggling" into qt-qpr1-dev
Hai Shalom [Fri, 15 Nov 2019 21:39:00 +0000 (13:39 -0800)]
[WPA3] Hide connect button for cloned networks not in range
Cloned networks are WPA2 or Open networks that have a WPA3 or OWE
cloned networks with the same SSID and credentials. When an AP
in transition mode is in the area, the scan results will only
report the higher security level. In order to prevent a case
where the user forcely connects to the AP with the lower security,
disable this option for those networks. Otherwise, it will look
that Wi-Fi is connected, but Wi-Fi picker will not show a connected
network.
Bug:
143843364
Test: Manual test
Change-Id: Id002b109bd056105ec8335acd298fa3b314c73f3
Merged-In: I7244c41d3bf12ba573c3cfca077d0ac2cfdcf5ed
Bill Yi [Fri, 15 Nov 2019 20:09:15 +0000 (12:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8c576fcd3e758334750e0fa24253cff9ee95466b
Auto-generated-cl: translation import
Sunny Shao [Mon, 4 Nov 2019 06:51:05 +0000 (14:51 +0800)]
Add a dark theme slice
Fixes:
142476879
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I4865c3c4a807bc4ac96762a882b193a3e2595019
Yi-Ling Chuang [Mon, 7 Oct 2019 02:24:27 +0000 (10:24 +0800)]
Fix non responding slice toggling
The issue happens when users are toggling slices. Sometimes the toggle
doesn't work as expected because the pending intent of the toggle action
seems to be canceled for some reasons.
Hence, we replace FLAG_CANCEL_CURRENT with FLAG_UPDATE_CURRENT to
prevent from getting PendingIntent.CancelExcpetion from SliceActionView
when toggling slices.
This change only applies on those auto converted Slices.
Bug:
140719905
Test: toggle slices in Settings Search and NGA
Change-Id: Iff724ce5f6a1e6a7d9ca85b8ce76539a72e72964
Merged-In: Iff724ce5f6a1e6a7d9ca85b8ce76539a72e72964
(cherry picked from commit
ddf6cefcaccf669150bb4d61e37c1d78ccbe91b0)
Jason Chiu [Mon, 28 Oct 2019 10:17:04 +0000 (18:17 +0800)]
Fix Settings creating too many threads unexpectedly
Limit the number of threads by using the shared thread pool in
ThreadUtils.
Bug:
143434413
Test: manual
Change-Id: I4afe1f641a11e218616772c1d5446efcc99cd1cc
Merged-In: I4afe1f641a11e218616772c1d5446efcc99cd1cc
(cherry picked from commit
3e4c47dbc090310edcf14b1c5094259f74ff0525)
Bill Yi [Sat, 9 Nov 2019 07:40:50 +0000 (23:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5b9dc323282c81680df423e4df855f9f25e3c028
Auto-generated-cl: translation import
Sunny Shao [Tue, 29 Oct 2019 08:20:48 +0000 (16:20 +0800)]
Fix the MMS messages toggle preference not working
- MMS messages toggle preference doesn't work while the default Mobile data is on then switches off.
- Recall the displayPreference to execute the preference.setOnPreferenceChangeListener
in the AbstractPreferenceController.
Fixes:
143204818
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.network.telephony.MmsMessagePreferenceControllerTest
Change-Id: Ida65d04b095b7d2556fa5bdd93be7a67cba77206
Merged-In: Ida65d04b095b7d2556fa5bdd93be7a67cba77206
(cherry picked from commit
054e0eab872a795d81efce7629d03845e9bfb92c)
TreeHugger Robot [Tue, 5 Nov 2019 05:34:41 +0000 (05:34 +0000)]
Merge "Fix Battery page animation" into qt-qpr1-dev
Raff Tsai [Mon, 19 Aug 2019 08:40:36 +0000 (16:40 +0800)]
Fix Battery page animation
TextView summary1 has default height 2 line. If the content is longer
than 2 line, the TextView increases itself which causes the animation.
By increasing minLines to 3, it can avoid the animation. And remove
summary2 because it is only for debug purpose, the debug information
can be merged to summary1.
Fixes:
139554919
Test: visual, make RunSettingsRoboTests
Change-Id: I167ac87c9bd83035e00d4991961599e76f4f69e1
(cherry picked from commit
648ada031d932adc73a2a521473d2c7309a16139)
Merged-In: I167ac87c9bd83035e00d4991961599e76f4f69e1
Bill Yi [Sun, 3 Nov 2019 00:25:40 +0000 (17:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie3137ceba6f623d0a7aa1176166930b522dee60e
Auto-generated-cl: translation import
Kevin Chyn [Fri, 1 Nov 2019 17:01:32 +0000 (17:01 +0000)]
Merge "Revert "Remove attention controller"" into qt-qpr1-dev
Kevin Chyn [Fri, 18 Oct 2019 18:19:18 +0000 (18:19 +0000)]
Revert "Remove attention controller"
Bug:
142979808
This reverts commit
8e1d1ca3abbd35530019318361afd99901840d38.
Change-Id: I78b7572bcb384de2984f4d81946aceb03aec6758
Kevin Chyn [Sat, 19 Oct 2019 00:54:36 +0000 (00:54 +0000)]
Revert "Update attention string"
Bug:
142979808
This reverts commit
821fbc83a1f5ec3c914a37821b218471f0bc8431.
Change-Id: Ibe426d3175b8b44fadaf78316201031f229d736e
Bill Yi [Thu, 31 Oct 2019 01:50:23 +0000 (18:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7256e981ee4f567d1b09dce74e476375f4f58bb3
Auto-generated-cl: translation import
Bill Yi [Sun, 27 Oct 2019 15:01:49 +0000 (08:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I519674aef33bc822977cf0e00edf02aff7b8245f
Auto-generated-cl: translation import
Bill Yi [Sat, 19 Oct 2019 07:50:29 +0000 (00:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d35ecce542fee9f4f6367d2a11a4cca2d4b4b60
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 17 Oct 2019 01:32:14 +0000 (01:32 +0000)]
Merge "Fix non responding slice toggling problem." into qt-qpr1-dev
SongFerngWang [Thu, 10 Oct 2019 12:18:30 +0000 (20:18 +0800)]
String "CDME" is wrong
Bug:
142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Bill Yi [Sun, 6 Oct 2019 22:03:16 +0000 (15:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
aa605a2ff8 -s ours
am skip reason: subject contains skip directive
Change-Id: I67820e45b4aceb3a9d3c141cc3be69e899551e2e
TreeHugger Robot [Sun, 6 Oct 2019 19:48:23 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Sun, 6 Oct 2019 14:50:11 +0000 (07:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4fdf91f299defd2a361d76455093db5a410d0d6
Auto-generated-cl: translation import
Bill Yi [Sun, 6 Oct 2019 14:36:10 +0000 (07:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1af1cc81e5fffb4ead2146f8871efa5115f91be2
Auto-generated-cl: translation import
Yi-Ling Chuang [Fri, 27 Sep 2019 04:21:59 +0000 (12:21 +0800)]
Fix non responding slice toggling problem.
The issue happens when users are toggling slices. Sometimes the toggle
doesn't work as expected because the pending intent of the toggle action
seems to be canceled for some reasons.
Hence, we replace FLAG_CANCEL_CURRENT with FLAG_UPDATE_CURRENT to prevent from
getting PendingIntent.CancelExcpetion from SliceActionView when toggling
slices.
Note that this change would only apply on Wifi, MobileData, Flashlight
and Bluetooth Slices.
Bug:
140719905
Test: rebuild and switch toggles
Change-Id: Iddbb16ddcbcf97b6f6e680b43645c04fbc061f39
SongFerngWang [Fri, 30 Aug 2019 08:06:41 +0000 (16:06 +0800)]
Preferred network list add 5G item
Preferred network list add 5G item, and change "recommended" from 4G to
5G, and add summary for 5G.
Bug:
138544359
Test: 1.fake the device network type bitmask to 5G, UI show 5G list
2.atest EnabledNetworkModePreferenceControllerTest.java :pass
Change-Id: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
SongFerngWang [Fri, 23 Aug 2019 10:03:27 +0000 (18:03 +0800)]
RadioInfo network mode list and network mode string add 5G
Bug:
131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
Bill Yi [Wed, 2 Oct 2019 23:55:04 +0000 (16:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33d1ef5a92b84fc166b35f7b5b341e7a92b35820
Auto-generated-cl: translation import
Bonian Chen [Wed, 2 Oct 2019 02:44:34 +0000 (02:44 +0000)]
Merge "[Settings Telephony] Carrier name API replacement" into qt-qpr1-dev
Bill Yi [Tue, 1 Oct 2019 23:05:46 +0000 (16:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
141777841
Change-Id: I5ef0e8ee2f723c81d4cc1c0be5daf311c7c38e84
TreeHugger Robot [Tue, 1 Oct 2019 22:08:03 +0000 (22:08 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Joshua Mccloskey [Tue, 1 Oct 2019 22:05:41 +0000 (22:05 +0000)]
Merge "Added new string." into qt-qpr1-dev
Bill Yi [Tue, 1 Oct 2019 19:53:15 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I594742575ea6729d9c71e0ef04658f6513875aaf
Auto-generated-cl: translation import
Bonian Chen [Mon, 9 Sep 2019 07:10:13 +0000 (15:10 +0800)]
[Settings Telephony] Carrier name API replacement
Replacing TelephonyManager.getNetworkOperatorName() by
Obtaining carrier name from SubscriptionInfo.getCarrierName().
TelephonyManager.getNetworkOperatorName() only be used when there's no
SubscriptionInfo can be found.
Bug: b/
140443508
Test: Manual testing
atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest
Change-Id: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
Bill Yi [Mon, 30 Sep 2019 10:35:57 +0000 (03:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I10e5b04a3a580ba34f945305d011ac192a3c4dd3
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 28 Sep 2019 21:05:31 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Sat, 28 Sep 2019 11:11:34 +0000 (04:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idfb9ca3c6ddf6aa0a9bc04a262b8e0fd76032867
Auto-generated-cl: translation import
joshmccloskey [Fri, 27 Sep 2019 22:09:05 +0000 (15:09 -0700)]
Added new string.
Fixes:
141762646
Test: Verified that string translates to spanish after changing
the language.
Change-Id: I48e34de15460c93c8f50d26821c4d64984f20c6d
joshmccloskey [Fri, 27 Sep 2019 21:54:38 +0000 (14:54 -0700)]
Changed string for translations.
Fixes:
141762646
Test: Verified that string translates to spanish after changing
the language.
Change-Id: Ieebb2ec15cf5cff2afcfefcb130193bdce6086fe
Kevin Chyn [Fri, 27 Sep 2019 05:01:56 +0000 (22:01 -0700)]
Fix FaceSetupSliceTest
Bug:
141380252
Test: make -j56 RunSettingsRoboTests
Change-Id: Ifb9a29d8f3115759a9e8e93e3721135c6ba229bf
joshmccloskey [Thu, 19 Sep 2019 18:23:29 +0000 (11:23 -0700)]
Added different flow for re-enrollment
In order to enable this new flow, a user must currently have an enrolled
face and the security setting face_unlock_re_enroll must be non-zero.
Ex.
1. Enroll Face.
2. adb shell settings put
(secure face_unlock_re_enroll|secure_face_unlock_must_re_enroll) 1
3. If settings is opened, close it.
4. Open settings
5. Verify the new flow appears.
Bug:
141380252
Bug:
141254937
Test: Verified that the user's face is deleted after clicking delete.
Test: Verified that the user can re-enroll after removing their face.
Change-Id: I2b36a0bda5cb10fb33dfb2a5627d8fa40f14fb7e
joshmccloskey [Tue, 24 Sep 2019 22:07:08 +0000 (15:07 -0700)]
Added mandatory scrolling for FaceIntroduction
Test: Verified in SUW/Settings user must scroll through contents in
order to go to the next screen.
Bug:
141380294
Change-Id: I483ab6ae6a282c81ba2f2c4d1d9d1f21c6cb9453
Bill Yi [Sun, 22 Sep 2019 19:53:43 +0000 (12:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
73915b77ed -s ours
am skip reason: subject contains skip directive
Change-Id: Ief64a890db8759f6361b58d304ff4f7e333739c6
TreeHugger Robot [Sun, 22 Sep 2019 19:42:36 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Sun, 22 Sep 2019 14:52:20 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I92110fede16a12a445efbd96896e17f46f89a203
Auto-generated-cl: translation import
Bill Yi [Sun, 22 Sep 2019 14:38:24 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib6e2dcd3084a0399fec672c4fff3a51e8dd0d195
Auto-generated-cl: translation import
Edgar Wang [Sat, 21 Sep 2019 08:54:47 +0000 (08:54 +0000)]
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
Edgar Wang [Thu, 19 Sep 2019 11:23:01 +0000 (19:23 +0800)]
Handle Aware sensor status for Always On
- "Always On" preference will be hiden when aware
sensor is available
- Extract NavModeCandidateInfo from SystemNavigationGestureSettings
Bug:
136610131
Test: robotest & manual
Change-Id: If58c70549339b66116f19df7193d85bb04e3f1b7
Bonian Chen [Thu, 19 Sep 2019 20:07:20 +0000 (20:07 +0000)]
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
Bonian Chen [Wed, 11 Sep 2019 06:35:15 +0000 (14:35 +0800)]
[Help Page] Support help content under 2 CDMA SIM
Fix the design for displaying help content.
Launch help content from notification (PendingIntent) could not be resolved correctly.
Route through HelpTrampoline to fix it.
Bug:
139040358
Test: Manual with fake from framework side for dual CDMA SIM
Change-Id: Iff3a6e9095c3908b3c5b1a25e2535bcab1858ae2
joshmccloskey [Tue, 17 Sep 2019 20:04:08 +0000 (13:04 -0700)]
Updated face remove dialog string.
Test: Verified that the correct string shows after deleting
face data.
Fixes:
141145591
Change-Id: I836c79fb4775157ae4995f706e05d1fd1233bc8f
Mady Mellor [Mon, 16 Sep 2019 21:55:52 +0000 (21:55 +0000)]
Merge "qt-r1-bubbles-dev @ build
5835883" into qt-qpr1-dev
OSDN Git Service
