PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,078 Commits 1 Branch 0 Tags
36f714cbafebdcc73bf8fd83bf6bd227cd72d23e
Commit Graph

82078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugh Chen
e914289a2c RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I5c756e1ae08c73f8a20ceacb106eb51b9cc3267b
 2021-05-11 06:18:11 +00:00
TreeHugger Robot
9724c735da Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: Ia0822c53ab65ce90334aee521be99886945d41e8
 2021-05-11 06:16:53 +00:00
Hugh Chen
53ff99b8b4 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449

Change-Id: I23ab4bb935d65f3afda82333291d0ea7a187428a
 2021-05-11 06:16:53 +00:00
TreeHugger Robot
54f47d0953 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I4a4c7bd80496a8fa883c895080d4d4c48a3fa3e9
 2021-05-11 06:16:43 +00:00
Hugh Chen
7b05629834 RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I7256d5f30d6c4b3063181a768b5d3796cf517383
 2021-05-11 06:16:42 +00:00
TreeHugger Robot
f9c99c40d2 Merge changes Ia51528f2,Id27a7809 into pi-dev 
* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
 2021-05-11 06:03:54 +00:00
TreeHugger Robot
75e33fb315 Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev 
* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
 2021-05-11 06:03:45 +00:00
TreeHugger Robot
f45fa1bf85 Merge changes Ia51528f2,Id27a7809 into rvc-dev 
* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
 2021-05-11 06:03:28 +00:00
TreeHugger Robot
4074cd5e48 Merge changes Ia51528f2,Id27a7809 into qt-dev 
* changes:
  RESTRICT AUTOMERGE Fix unable to send file via OPP
  RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
 2021-05-11 06:03:19 +00:00
Wesley.CW Wang
7a8d2f4486 Fix color check error 
Bug: 187772407
Test: make SettingsRoboTests; repo upload
Change-Id: Ia1c89864043d201e8c7a180c9087a56e6f4ca235
 2021-05-11 13:21:38 +08:00
YUKAI HUNG
91d9b370e1 Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2 am: 16fe59dab7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919

Change-Id: Idee5d47d7440e9f39d5de873413d3aa1869a2405
 2021-05-11 04:21:27 +00:00
YUKAI HUNG
16fe59dab7 Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev am: 7a678f29b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486919

Change-Id: I7cef4dd0725ed2fe30ab23806a27ede46add4b70
 2021-05-11 04:06:17 +00:00
YUKAI HUNG
7a678f29b2 Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev 2021-05-11 03:47:58 +00:00
Peter Kalauskas
c24234c301 Add tests for guest user events 
Also, move ACTION_USER_GUEST_EXIT_CONFIRMED so it is only logged after
safety-check

Test: ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest" m RunSettingsRoboTests
Test: ROBOTEST_FILTER="com.android.settings.users.UserDetailsSettingsTest" m RunSettingsRoboTests
Bug: 184200796
Change-Id: Id18aa914bbb262984d7c7cf4b8a4ffdde278fd23
 2021-05-10 20:36:48 -07:00
Jason Chiu
b22d9bdb0e Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69 am: ad838712ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412

Change-Id: I8b6ffc80e01b77a40d5931a423f8600ed7cbb674
 2021-05-11 03:13:16 +00:00
Sunny Shao
a82183a5f9 Disable the info icon 
- Show disabled info icon.
- Remove the duplicated resouce files.

Fix: 186608804
Fix: 182870810
Test: manual test
Change-Id: I8c0ddc8f76921965073699d5bd029dc1b9d59fb0
 2021-05-11 11:12:03 +08:00
Jason Chiu
ad838712ed Merge "Apply the new search bar background color" into sc-dev am: 0c2fa9cd69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441412

Change-Id: I12fb430c12a6409e770108a0cf5f7448fad5a14e
 2021-05-11 02:57:36 +00:00
Jason Chiu
0c2fa9cd69 Merge "Apply the new search bar background color" into sc-dev 2021-05-11 02:42:08 +00:00
Joe Bolinger
971f0f3c5a Add userId parameter to all uses of challenge in settings. 
Bug: 184915229

Test: manually on device (as normal, extra user, & work profile)
Change-Id: Id509b5866d53525b38a5bb95bbbcc723d6651745
 2021-05-10 18:26:57 -07:00
Wesley Wang
3d615d4e16 Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18 am: c06523741c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918

Change-Id: Id242d32c6f35e9301bf27aa229bb5f27ca8e2b7c
 2021-05-10 17:34:43 +00:00
Wesley Wang
2e663eb5e9 Merge "Update battery usage summary" into sc-dev am: 56488ef84b am: d591642bb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916

Change-Id: I348da0b49153cb3d35d9d0a61760decb4b43e8cf
 2021-05-10 17:34:14 +00:00
Wesley Wang
c06523741c Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev am: e19d238d18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486918

Change-Id: I9e5f1c75d9eac0bce0b4ca7582362d6154d1a48b
 2021-05-10 17:19:08 +00:00
Wesley Wang
d591642bb7 Merge "Update battery usage summary" into sc-dev am: 56488ef84b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486916

Change-Id: I13035b036a2ad7956506d217edd22375b5a74d39
 2021-05-10 17:18:31 +00:00
Wesley Wang
e19d238d18 Merge "Fix AdvancedPowerUsageDetailTest test error" into sc-dev 2021-05-10 17:01:28 +00:00
Wesley Wang
56488ef84b Merge "Update battery usage summary" into sc-dev 2021-05-10 17:00:07 +00:00
Julia Reynolds
aef5f6adce Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059 am: 9936e10d1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497

Change-Id: Icb677001b96709d18e1298428cdbc93a64b88e83
 2021-05-10 16:20:56 +00:00
Julia Reynolds
9936e10d1e Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497

Change-Id: Ia5229cbf3410aed9029d767a322f85ecb65df729
 2021-05-10 15:59:02 +00:00
Julia Reynolds
333b68d059 Merge "Handle NLS metadata when provided as strings" into sc-dev 2021-05-10 15:56:35 +00:00
ykhung
4645fef6ca Add searchable keywords for new usage and adaptive preferences screen 
Bug: 185432878
Bug: 185433678
Bug: 185855057
Test: make SettingsRoboTests
Change-Id: Ibca47e7732f72cba03fbfae10075ac83f1938b43
 2021-05-10 15:40:14 +00:00
TreeHugger Robot
fcfd177aad Merge "Fix work profile setting appearing too often" into sc-dev am: 9cb5ab3860 am: 82ddd0b57e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470515

Change-Id: I3713e87abbdece69d4bafb65a946144ef20df3f3
 2021-05-10 14:01:14 +00:00
TreeHugger Robot
82ddd0b57e Merge "Fix work profile setting appearing too often" into sc-dev am: 9cb5ab3860 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470515

Change-Id: Ide92d00f9619dfa7cab8427f0d84f03af4a0993b
 2021-05-10 13:45:22 +00:00
Wesley.CW Wang
59b3f3e129 Update battery status good icon color am: 021e6b131f am: 91062b1af8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456012

Change-Id: I59d34fafd00849347b92f6371ef66dbf06b68212
 2021-05-10 13:34:42 +00:00
TreeHugger Robot
9cb5ab3860 Merge "Fix work profile setting appearing too often" into sc-dev 2021-05-10 13:26:31 +00:00
Wesley.CW Wang
91062b1af8 Update battery status good icon color am: 021e6b131f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456012

Change-Id: I1a8f459d2ba474db61496f2109ce809c2a0db58f
 2021-05-10 13:19:53 +00:00
Wesley.CW Wang
8d5010f6ec Update battery usage summary 
- Set up different summary for AOSP

Bug: 185855825
Bug: 187667156
Test: make SettingsRoboTests
Change-Id: I94dccfc325ecfcff8013fe4d3b5b65c427dcae5c
 2021-05-10 13:03:12 +00:00
Wesley.CW Wang
25498983b2 Fix AdvancedPowerUsageDetailTest test error 
Bug: 187693428
Test: make SettingsRoboTests
Change-Id: I3c3976b93a5dfb242af09bcfbf700a1caddd350b
 2021-05-10 13:02:18 +00:00
Wesley.CW Wang
021e6b131f Update battery status good icon color 
screenshot: https://screenshot.googleplex.com/6eqfv3xBWp52gjg.png

Bug: 187608939
Test: make SettingsRoboTests
Change-Id: Ib4ac236ae77f624152e00e167e8035dab428b994
 2021-05-10 10:25:36 +00:00
Tsung-Mao Fang
55ab3f91e5 Fix color contrast problem for VPN page 
Test: A11y scanner doesn't show text contrast problem
Fix: 187399519
Fix: 181185518
Change-Id: I830a8b16d817bbdf2c68332e38fad0a15b87ce45
 2021-05-10 09:54:12 +00:00
Tom Hsu
17ebc62223 Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev am: fa024d6fc8 am: 444fef8f4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456005

Change-Id: I2349d6cec054ff8827c2f27c08461487d0b6e993
 2021-05-10 09:19:47 +00:00
Tom Hsu
444fef8f4c Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev am: fa024d6fc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456005

Change-Id: I56df147a622855935d4356c60e0acadde3b4ac00
 2021-05-10 08:56:43 +00:00
Tom Hsu
fa024d6fc8 Merge "Show W+ when connected to Carrier Wi-Fi Network" into sc-dev 2021-05-10 08:35:36 +00:00
Ryan Lin
1580cd21ba Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev am: 4523f9200f am: cb1cb02224 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456010

Change-Id: If86e85741eeb41f7df9e5bf51613c3b994291999
 2021-05-10 08:08:16 +00:00
Syaoran Kuo
a0e43be923 Merge "Add more log for debugging resource id issue." into sc-dev am: e37d12e5c4 am: 37ab5dbc8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456004

Change-Id: I82a5d5e42a77426d3ae41e290d8fcc65c34458cf
 2021-05-10 08:08:01 +00:00
Ryan Lin
cb1cb02224 Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev am: 4523f9200f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456010

Change-Id: Ic8490dfe0b10d65536988b3db938926a04953716
 2021-05-10 07:36:08 +00:00
Syaoran Kuo
37ab5dbc8f Merge "Add more log for debugging resource id issue." into sc-dev am: e37d12e5c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456004

Change-Id: Iabf06a3427349d249629cda84b5d045abbe71236
 2021-05-10 07:35:56 +00:00
Ryan Lin
4523f9200f Merge "Fix Punctuation inconsistency in the Magnification shortcut pop up" into sc-dev 2021-05-10 07:27:46 +00:00
Syaoran Kuo
e37d12e5c4 Merge "Add more log for debugging resource id issue." into sc-dev 2021-05-10 07:17:28 +00:00
TreeHugger Robot
fabd6033e7 Merge "Merge existing bundle with ActivityOptions" into sc-dev am: 57d8d38a3c am: 0819ab21c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455998

Change-Id: Ibdd64f5d67600e166ebde386cbdd8a127f30d7ce
 2021-05-10 06:43:07 +00:00
TreeHugger Robot
0819ab21c5 Merge "Merge existing bundle with ActivityOptions" into sc-dev am: 57d8d38a3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455998

Change-Id: I532465e9d68671167ac6a00409aef793d9f80226
 2021-05-10 06:20:52 +00:00
tom hsu
2519077d97 Show W+ when connected to Carrier Wi-Fi Network 
Internet picker
  - https://screenshot.googleplex.com/7k4ojF65a8Bis5R
 Internet panel
  - https://hsv.googleplex.com/6749112168873984
Bug: 185431894
Test: atest passed

Change-Id: Ic79686b47f033870ad8e7741f9baf3230dde7b7c
 2021-05-10 14:08:05 +08:00