PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,921 Commits 1 Branch 0 Tags
c5b8ae80ea76d764a2f6237bf6d716a0222f9f6c
Commit Graph

85921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
6a41d25bcc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-17 19:44:13 +00:00
Hansong Zhang
13f41075d4 Log when DEBUG is on 
Bug: 181588752
Test: manual

Change-Id: I43331ad011c9667d05ca752f523bc65883977c3c
 2021-08-17 12:27:50 -07:00
Xin Li
c1853be4d0 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours 
am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

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

Change-Id: Ib85f7f13d04e651389e95994dd4854b92292a34b
 2021-08-17 18:36:03 +00:00
Xin Li
7d646a5182 Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master 2021-08-17 18:14:14 +00:00
ykhung
5589007530 [QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure 
after discussed with kdeus@ we will remove the setResult() from the
dialog action to avoid the caller apps can distinguish the users
interaction behavior, and declared REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
in other applications.

Bug: 195963373
Test: make SettingsRoboTests
Change-Id: Ia2e47c493c206e96b0bc1d9f08735c0f9474c233
Merged-In: Ia2e47c493c206e96b0bc1d9f08735c0f9474c233
(cherry picked from commit 518d6df4f4)
 2021-08-17 17:14:29 +00:00
Treehugger Robot
e016e0b03f Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d am: 9ee42fc623 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I4e704c29fa65197dbe1ba6e6471d925c0ad19a60
 2021-08-17 09:37:38 +00:00
Treehugger Robot
9ee42fc623 Merge "Add biometric OWNERS to unit tests." am: 9689490c22 am: 2fbbcd3d9d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I56890f77bf79e84953a0ce01f2cec4089682fbf4
 2021-08-17 09:22:56 +00:00
Treehugger Robot
2fbbcd3d9d Merge "Add biometric OWNERS to unit tests." am: 9689490c22 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1795029

Change-Id: I355edf3a1ff7efb93a3c8eff94bb77104e60a5cb
 2021-08-17 09:12:11 +00:00
Treehugger Robot
9689490c22 Merge "Add biometric OWNERS to unit tests." 2021-08-17 08:43:12 +00:00
Weng Su
1fe8220afa Add new ACTION_WIFI_DETAILS_SETTINGS to Settings 
- Need to export the interface to Quick Settings to launch Wi-Fi Network
details settings.

- Rename WifiNetworkDetailsFragment.class

Bug: 191475923
Test: manual test with the topic CLs.
make RunSettingsRoboTests
atest -c SettingsUnitTests:com.android.settings.wifi \
         SettingsUnitTests:com.android.settings.network

Change-Id: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
(cherry picked from commit e8a4e13a80)
Merged-In: Id2fd8c9b3b113ffbb49168305b05c67392fa4d87
 2021-08-17 08:14:55 +00:00
ykhung
0791d77df0 [QPR1] Add time unit into battery usage chart and refine some UI 
- add time unit into battery chart for 12/24 hours
- refine the radius size for chart bar
- use fixed font size for timestamp and percentage

screenshots:
24-hour format: https://screenshot.googleplex.com/3VNedE2nAx6LrXu
12-hour format: https://screenshot.googleplex.com/3tpTXjYfrasrenW
fixed-size: https://screenshot.googleplex.com/nPRKm7XCkmFzW6K

Bug: 194836607
Test: make SettingsRoboTests
Change-Id: I5b35b0fa808eb8a5f607962ee973c2896529b078
Merged-In: I5b35b0fa808eb8a5f607962ee973c2896529b078
 2021-08-17 06:09:56 +00:00
Bill Yi
73f4597617 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib8067f7f7b9ce0b3c3c9b164c16c2124754259f4
 2021-08-16 22:54:27 -07:00
Bill Yi
635d7a2949 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb 
Blank merge reason: commit message contains skip directive

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

Change-Id: I4c5f57616aa0bda605f4fcd4f7de90a6c8b64853
 2021-08-17 05:49:49 +00:00
Bill Yi
d1e4f888fb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icabf059c62f547d2bf1bef0bc04e8e22d1613bc9
 2021-08-16 22:49:25 -07:00
Bill Yi
d49b8b74d0 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe35735e2e3ab8087dfc0f2303e4b32318ac95a3
 2021-08-16 22:37:14 -07:00
Bill Yi
cd0d73535b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iab4d8828f2a190ed85f24dc2ec2f58f7082744f3
 2021-08-17 05:35:19 +00:00
Bill Yi
21392f9ffb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e71e551f5efede9979e39aa215cfb597bb3135d
 2021-08-16 22:35:06 -07:00
Bill Yi
25b3ab76e4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4be1756b35504ec9d49bc7b8d6bd7b7e753aae8b
 2021-08-16 22:29:11 -07:00
Bill Yi
f82b80a567 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie28ab84cb3ef23d6602af63e2e531d7057000d2f
 2021-08-16 22:24:38 -07:00
Bill Yi
6f047583bc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6680983f470525631710e359072fe27a81a322be
 2021-08-16 22:09:54 -07:00
Bill Yi
a687e17227 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaed09e1a4628fec8391ad74d6eb451c8dbb997a0
 2021-08-16 22:02:55 -07:00
Treehugger Robot
5f69669adb Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c am: 78ed3bb6ee 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: Ibf4c5605ece3d2f49602b60602c523d1e7c4877b
 2021-08-17 04:41:07 +00:00
Treehugger Robot
78ed3bb6ee Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: I3d44a009fc1fb653a074c0b5075b673dcbee82d8
 2021-08-17 04:28:48 +00:00
Treehugger Robot
b294717b4c Merge "Update OWNERS." am: 0544dc7b92 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1797467

Change-Id: I8cef16ea650efa1d2f2479055779a84d266b7085
 2021-08-17 04:09:55 +00:00
Treehugger Robot
0544dc7b92 Merge "Update OWNERS." 2021-08-17 03:57:07 +00:00
Curtis Belmonte
115bbd0556 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: 36a42b630b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I990c32d04641473d686914558eb801a1d0e865d7
 2021-08-17 01:15:51 +00:00
Curtis Belmonte
09beed19de Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 am: f07f8b57eb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I4b1c644efefef622f6fdc5b426f38ead71adc1ec
 2021-08-17 01:02:27 +00:00
Curtis Belmonte
36a42b630b Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ia1824f9bbb81d95e928f32f39f088a4a6aeaef9e
 2021-08-17 01:02:08 +00:00
Curtis Belmonte
474fba01f1 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ibb2a4c9f98a1c6f302288252201d12f28de4a1e1
 2021-08-17 01:01:47 +00:00
Curtis Belmonte
f07f8b57eb Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I6428763357c016f863a7eead05c8424b7efe9ba4
 2021-08-17 01:01:17 +00:00
Curtis Belmonte
7fb2316a21 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev 2021-08-17 00:47:58 +00:00
Curtis Belmonte
2b318b3b69 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp 
* changes:
  [automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
  Remove/replace old fingerprint icon in SUW/Settings
 2021-08-17 00:47:58 +00:00
Yomna Nasser
4ff69294a4 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: ea343fa5a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I357fb09a14d85c85fed75603da9f96aa44ff6786
 2021-08-17 00:43:41 +00:00
Yomna Nasser
da6c658b99 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: 87259ab2af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I3a5aa2741d2a8bb9495fb5e88b27d1248d60f7ef
 2021-08-17 00:43:26 +00:00
Yomna Nasser
ea343fa5a4 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: Ic40a46ce6d36e5147fc99ed3afb1bb1735164cad
 2021-08-17 00:30:30 +00:00
Yomna Nasser
87259ab2af Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I04e70b72a0c2cd197ae993139c9fb60b01a07a23
 2021-08-17 00:29:43 +00:00
Joe Bolinger
6e1ecbd617 Update OWNERS. 
Test: N/A
Change-Id: I6646a2b7dda95f458b95c0fed331b1cb213fcae8
 2021-08-16 17:12:53 -07:00
Yomna Nasser
cf77b7a248 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev 2021-08-17 00:12:39 +00:00
Curtis Belmonte
dbef2415d3 [automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ief92774377376ea11b4e099f7c0cf5764cbf7f31
 2021-08-16 21:44:39 +00:00
Curtis Belmonte
dc9b53c446 Remove/replace old fingerprint icon in SUW/Settings 
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.

Test: Manual

Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
 2021-08-16 14:44:15 -07:00
changbetty
3043c87f98 Remove some attributes to move the dialog window up 
Bug: 192815830
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialog2Test
Change-Id: Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7
Merged-In: Ia8ce6cfa19cd5d57695dc0092b1585d8cad5a8d7
 2021-08-16 08:34:06 +00:00
changbetty
6871807a95 Set the attribute of the dialog window for overlay QS internet panel 
Bug: 190460969
Test: Manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialog2Test

Change-Id: I1acdfb09393163bb94824fe2b3bad0391ba4fb53
Merged-In: I1acdfb09393163bb94824fe2b3bad0391ba4fb53
 2021-08-16 08:32:47 +00:00
Android Build Coastguard Worker
c53207931a Snap for 7643215 from 7efaff8d0f to sc-qpr1-release 
Change-Id: I4ec1913aaa7b48db2df3fd5358609bfceec5186b
 2021-08-14 23:08:06 +00:00
TreeHugger Robot
f680c9b0b5 Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: If4c7ffd19e06965e34f5185e63b22d58d3ca08d8
 2021-08-14 07:26:53 +00:00
TreeHugger Robot
7efaff8d0f Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev 2021-08-14 07:13:12 +00:00
Xin Li
42be0d2f75 Merge sc-dev-plus-aosp-without-vendor@7634622 
Merged-In: Id2a8c43f9bca79200f837759ce9de0a6eba2a37a
Change-Id: I90fe22409ec7832714c8530f54408db747bdf3c4
 2021-08-14 06:30:57 +00:00
Android Build Coastguard Worker
e8c1d7a94a Snap for 7641961 from 0af8e8e5cd to sc-qpr1-release 
Change-Id: Ic1f2715f999d39093cf2a0b40e5d84419b630d7f
 2021-08-14 03:08:25 +00:00
TreeHugger Robot
17a08343bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: 0af8e8e5cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ba4dec8d28bdbe01c84416331040d1c3d67d20b
 2021-08-13 19:45:03 +00:00
Bill Yi
6e95702bd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: 15bb8d9aae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebc1f394ba75463a6743808a97bea0ec1655c98b
 2021-08-13 19:44:56 +00:00
TreeHugger Robot
69f2f00362 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: e51ac2563b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2df24400a8dd1a3acef085f6b062f09ddb41cf54
 2021-08-13 19:44:16 +00:00