Bill Yi
3efb76b03b
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9909286ace
2019-08-19 13:28:44 -07:00
Bill Yi
9909286ace
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I0f506526563a88f386ec68d2a31b00b3e5e3b47e
2019-08-19 10:42:35 -07:00
TreeHugger Robot
8d59885bc2
Merge "Use FooterPreference in xml explicitly"
2019-08-19 14:00:45 +00:00
TreeHugger Robot
795fe6a3ce
Merge "Use FooterPreference in xml explicitly"
2019-08-19 13:58:49 +00:00
Raff Tsai
fcaca1ac75
Remove ic_menu_refresh_holo_dark
...
Menu overflow item icon is removed for 1p apps. We don't need to
set it.
Bug: 139336138
Test: visual
Change-Id: I91216d0363211c5e9aee074810746999ae49b097
2019-08-19 18:15:49 +08:00
Raff Tsai
648ada031d
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
2019-08-19 16:47:53 +08:00
Jimmy Chen
d79363fec6
wifi: support SAE password identifier in wifi dialog
...
Bug: 138305265
Test: atest FrameworksWifiApiTests
Test: atest FrameworksWifiTests
Test: connect to a WPA3 SAE access point with different
password/identifer combinations.
Change-Id: Idf1f82faaafa9c5f2212a0fa1dcc2eec53a9dbd5
2019-08-19 13:31:53 +08:00
Sunny Shao
d04c885ff9
Use FooterPreference in xml explicitly
...
Removed the FooterPreferenceMixin from the RestrictedAppDetails page.
Fixes: 139641334
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge
Change-Id: I6a4e56725d88353bde361de1dfff4a2a449c842c
2019-08-19 11:50:06 +08:00
TreeHugger Robot
31c7ac1017
Merge "Fix flaky test error"
2019-08-19 02:44:56 +00:00
android-build-team Robot
25144933f8
Snap for 5811895 from 7892f729a5 to qt-c2f2-release
...
Change-Id: I0540ce5f28f36beeca6c68c07277dac43a4fc8af
2019-08-19 00:45:02 +00:00
Kevin Chyn
7af4e5a77c
Merge "Remove delay from enroll start button"
2019-08-17 18:42:04 +00:00
Bill Yi
b801b6605d
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours am: 978cd2b768 -s ours
...
am: 1d13f5c8bb
2019-08-17 10:06:03 -07:00
Bill Yi
23939bfcc1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours am: 5188a0560f -s ours
...
am: 49c7a74c59
2019-08-17 10:05:19 -07:00
Android Build Merger (Role)
1d13f5c8bb
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours am: 978cd2b768 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-08-17 16:55:37 +00:00
Bill Yi
49c7a74c59
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours
...
am: 5188a0560f
2019-08-17 09:55:19 -07:00
Bill Yi
c94de34259
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours
...
am: 978cd2b768
2019-08-17 09:55:17 -07:00
Bill Yi
978cd2b768
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
2019-08-17 09:45:16 -07:00
Bill Yi
5188a0560f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
2019-08-17 09:45:15 -07:00
Bill Yi
735e8a680d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 7892f729a5
2019-08-17 09:45:15 -07:00
TreeHugger Robot
7892f729a5
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-08-17 16:30:21 +00:00
Arc Wang
69d3c16b0e
[automerger skipped] Merge "Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 2394d0821b" into qt-qpr1-dev-plus-aosp
...
am: 22cbd5ca0d91200e610d
2019-08-17 07:43:42 -07:00
Arc Wang
3c01d14d7e
[automerger skipped] Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 0e53b6293d
...
am: a266ec8ffdfe9a794eaf
2019-08-17 07:37:29 -07:00
Android Build Merger (Role)
22cbd5ca0d
Merge "Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d am: 2394d0821b" into qt-qpr1-dev-plus-aosp
2019-08-17 14:28:18 +00:00
Arc Wang
a266ec8ffd
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
...
am: 0e53b6293d
2019-08-17 07:27:01 -07:00
Arc Wang
aece3458cf
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev am: 54dbed859d
...
am: 2394d0821b
2019-08-17 07:26:55 -07:00
Arc Wang
0e53b6293d
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
2019-08-17 07:18:03 -07:00
Arc Wang
2394d0821b
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
2019-08-17 07:17:59 -07:00
Arc Wang
5101624819
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
...
am: 54dbed859d
2019-08-17 07:17:59 -07:00
TreeHugger Robot
54dbed859d
Merge "[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem" into qt-r1-dev
2019-08-17 13:58:53 +00:00
Bill Yi
0bb9d1e153
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie3771d039d46900090a8a4f58f325b9a5eb29e0a
2019-08-17 01:35:46 -07:00
Kevin Chyn
058af41a42
Remove delay from enroll start button
...
Fixes: 139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
Merged-in: I365308c2a00c122b80f70c904d11bb4a5d6cf404
2019-08-17 04:52:30 +00:00
Kevin Chyn
1ae8beab06
Remove delay from enroll start button
...
Fixes: 139554930
Test: manual, button no longer delayed
Change-Id: I365308c2a00c122b80f70c904d11bb4a5d6cf404
2019-08-17 04:51:23 +00:00
TreeHugger Robot
98ae0159cd
Merge "Use FooterPreference in xml explicitly"
2019-08-17 04:45:14 +00:00
Kevin Chyn
86b34f8b65
Merge "Merge "Update attention string" into qt-r1-dev am: e218dc0517 am: 5725d33471" into qt-qpr1-dev-plus-aosp
...
am: 0abf9968d7
2019-08-16 20:30:14 -07:00
Kevin Chyn
4969e3c409
Merge "Update attention string" into qt-r1-dev am: e218dc0517 am: ddd4fb660e
...
am: 0967e12b69
2019-08-16 20:28:28 -07:00
Kevin Chyn
f490c7cb7f
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: 5725d33471
2019-08-16 20:01:16 -07:00
Android Build Merger (Role)
0abf9968d7
Merge "Merge "Update attention string" into qt-r1-dev am: e218dc0517 am: 5725d33471" into qt-qpr1-dev-plus-aosp
2019-08-17 02:52:20 +00:00
Kevin Chyn
0967e12b69
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: ddd4fb660e
2019-08-16 19:51:51 -07:00
Kevin Chyn
60c939da52
Merge "Update attention string" into qt-r1-dev am: e218dc0517
...
am: 5725d33471
2019-08-16 19:51:51 -07:00
Kevin Chyn
208b633c7e
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:51:18 -07:00
Kevin Chyn
ddd4fb660e
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:43:00 -07:00
Kevin Chyn
5725d33471
Merge "Update attention string" into qt-r1-dev
...
am: e218dc0517
2019-08-16 19:42:52 -07:00
TreeHugger Robot
79d9e9069b
Merge "[Wi-Fi] Check default data SIM instead of all active subscriptions for 'Switch to mobile data automatically' setting"
2019-08-17 02:40:20 +00:00
Kevin Chyn
e218dc0517
Merge "Update attention string" into qt-r1-dev
2019-08-17 02:01:31 +00:00
Arc Wang
91200e610d
[Wi-Fi] Fix multi SIM devices switch to mobile data automatically settings missing problem
...
Context#getResources loading is done based on the last SIM to
come up, we may get wrong customization settings.
This fix check the setting of active subscription and shows the preference.
Bug: 138956509
Test: CellularFallbackPreferenceControllerTest
manual test:
1. Insert feature supported SIM and check UI.
2. Remove feature supported SIM and check UI.
3. Turn airplane mode on and check 1. and 2..
Change-Id: I72b6db415429181395a02f163889bb1b9c0f070f
Merged-In: I72b6db415429181395a02f163889bb1b9c0f070f
2019-08-17 01:37:21 +00:00
Kevin Chyn
8e1d1ca3ab
Remove attention controller
...
Bug: 139484065
Test: manual
Change-Id: Ideed761c978ba0831b04ed2cc294e9655dddb01c
2019-08-16 16:34:09 -07:00
Kevin Chyn
821fbc83a1
Update attention string
...
Bug: 139484065
Test: manual
Change-Id: Ie4619fb51709ba2651866b7841dd4d6b51f165d1
2019-08-16 16:34:09 -07:00
Sunny Shao
513cc9561c
Use FooterPreference in xml explicitly
...
Removed the FooterPreferenceMixin from the SmartBatterySettings page.
Fixes: 139514284
Test: manual test
Change-Id: If9aee92916d02b731bdb71e9c95237e1c3ff7f1d
2019-08-16 17:14:57 +08:00
Sunny Shao
a3961cd6d7
Use FooterPreference in xml explicitly
...
Removed the FooterPreferenceMixin from the PowerUsageSummary page.
Fixes: 139515012
Test: manual test
Change-Id: I29af8ad4df303edeeb511057d53d38c847f0ff21
2019-08-16 16:49:59 +08:00
Goven Liu
fb9a140739
Merge "[Wi-Fi HotSpot] Improve Wi-Fi hotspot settings entries visibility problem"
2019-08-16 07:51:50 +00:00
