Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
93,590 Commits 1 Branch 0 Tags
22bbcb5acdd033bdd18b90463eb779fd2a6faf9f
Commit Graph

24308 Commits

Author SHA1 Message Date
Curtis Belmonte
a0847b6130 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-mainline-prod am: 562d29d081 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ia95f2c062c6dcdbd40ed5f51bcb7c4fa96dc3f88
 2021-08-17 01:01:21 +00:00
Curtis Belmonte
562d29d081 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-mainline-prod 
* 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
4c7c958e02 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: 862a35d7fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I151a87339710d05d0f737b507ff911788b423455
 2021-08-17 00:42:56 +00:00
Yomna Nasser
cf77b7a248 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev 2021-08-17 00:12:39 +00:00
Curtis Belmonte
5cf728d2fc [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: Ib847b70e4bc427d4f3c3b78f67a68b63b71d74c8
 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
Alex Florescu
d65e8ad16e Set a maximum width for the settings bottom panel on large screens am: 9fab04b913 am: d6adfa60d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15543301

Change-Id: Ib5266152aae2fcbaaa6be9c3ced83f672f681c36
 2021-08-16 10:56:19 +00:00
Alex Florescu
d6adfa60d5 Set a maximum width for the settings bottom panel on large screens am: 9fab04b913 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15543301

Change-Id: Icba157112b88c2568b7ffcaaafc8422e919af6f6
 2021-08-16 10:41:40 +00:00
Alex Florescu
9fab04b913 Set a maximum width for the settings bottom panel on large screens 
Bug: 187297703
Test: manual
Change-Id: I18ec554dbb6edae88b1d73f4682a77106f787461
 2021-08-16 09:15:01 +00:00
TreeHugger Robot
80544241db Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f am: f680c9b0b5 am: 85e6aba27f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: I8e6d18b8be6960be4e1557a07405d65412205b70
 2021-08-14 07:49:54 +00:00
TreeHugger Robot
85e6aba27f Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f am: f680c9b0b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: I22f3bf1a65273f70a59cb59018bc9f44d04552b2
 2021-08-14 07:37:41 +00:00
TreeHugger Robot
e9f836a004 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: Ic64df3fc905575608ec561ba9e8d2efb93fe0b7c
 2021-08-14 07:26:54 +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
Adam Bookatz
dc8a5ad008 Merge "Easy app-installing for Guest users" 2021-08-14 01:37:43 +00:00
TreeHugger Robot
1f7d2deea8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-13 21:05:09 +00:00
TreeHugger Robot
e0b3c1d567 Merge "Increase character limit for translations" 2021-08-13 20:11:03 +00:00
TreeHugger Robot
737f4d76c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:50:16 +00:00
TreeHugger Robot
65d286f6a9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:45:05 +00:00
TreeHugger Robot
cdc3f31562 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-13 18:15:24 +00:00
TreeHugger Robot
e4e2fb715f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-13 17:54:53 +00:00
TreeHugger Robot
fa782b4578 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-13 17:47:46 +00:00
TreeHugger Robot
c304ced072 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-08-13 17:38:56 +00:00
alinasuarez
118091fb1e Increase character limit for translations 
Translators need more than 40 characters for the subfactor translations.
This gives translators 2 lines for characters, making the character
limit 50. This still looks good with the UI.

Bug: 195773269
Bug: 195650506

Test: Visual
Change-Id: I13d395215780e0dc95bb27b2e6308a5affffae91
 2021-08-13 17:05:51 +00:00
Alfred Lin
7f8e775754 Prototyping : Demo Image on color setting 
Implement prototyping of demo image on color setting

Bug: 182797883
Test: adb shell am instrument -w -e class com.android.settings.display.ColorModePreferenceFragmentTest com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner test pass
Change-Id: Iebaaa6867f2039a25a5e1fd280a89b5bc9297e6b
 2021-08-13 15:08:58 +00:00
Bill Yi
d486302dc9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifc717c2991b14f66c2f9f6af95aab4a68113bf57
 2021-08-13 03:48:58 +00:00
Bill Yi
ec12fdf789 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I28896b0ff317484fc7b22d7152bd99720b247df9
 2021-08-13 03:46:10 +00:00
Bill Yi
f30152962c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib9973baa15d3f4d64436daf4afa21dc213118f6a
 2021-08-13 03:42:27 +00:00
Bill Yi
4cba8eeaa3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5a31fd17c58c7c0c7da73c7aa36715861db381d5
 2021-08-13 03:38:26 +00:00
Bill Yi
a89104fd31 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I52b666d62c7fa29e7b98ef5648952726ef34f1c8
 2021-08-13 03:34:34 +00:00
Bill Yi
d9ba125bb8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I34d0556797fbf5a0e80e97c5e76b7d805b303e83
 2021-08-13 03:32:57 +00:00
Bill Yi
ff33565826 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib1d716ccccc180e419f2fdc89cf1a500a91ebdcb
 2021-08-13 03:31:19 +00:00
Bill Yi
a5930e87ef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8576a40d924ca65d6c941429d3765bcfdb016f4e
 2021-08-13 03:17:14 +00:00
Bill Yi
289ff0bec9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6799cffe01f6bd506648117bd01d3bdb28739dd1
 2021-08-13 03:09:49 +00:00
Roshan Pius
2f28d8e3d0 Merge "Revert "UWB: Re-enable UWB toggle"" 2021-08-12 19:46:20 +00:00
Roshan Pius
2e593b3784 Revert "UWB: Re-enable UWB toggle" 
This reverts commit 7437b1f07e.

Reason for revert: Reverting until root cause of b/196317865 is identified.

Bug: b/196317865
Test: Compiles
Change-Id: I6dfed998c4387a54dac8d41ed65c5a30752ed290
 2021-08-12 17:05:18 +00:00
YUKAI HUNG
25a6752ac7 Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev am: cb2ec5399c am: cdc43dfc73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530296

Change-Id: I6c7be98e5752bcdfffb00b94333ed052ac2f9f9e
 2021-08-12 07:31:13 +00:00
YUKAI HUNG
cdc43dfc73 Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev am: cb2ec5399c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530296

Change-Id: I9551360d2c78279677efa94ae6cda28e98e04196
 2021-08-12 07:17:48 +00:00
YUKAI HUNG
cb2ec5399c Merge "Add time unit into battery usage chart and refine some UI" into sc-v2-dev 2021-08-12 06:46:26 +00:00
YUKAI HUNG
50ecf12ece Merge "Fix typo for Illustration Preference (picked from Wendy's patch)" into sc-v2-dev am: d7bf769cc4 am: cc29f09349 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530295

Change-Id: I76802169c0f1a555862c4447b16c8b2a7355d30b
 2021-08-12 06:10:24 +00:00
YUKAI HUNG
cc29f09349 Merge "Fix typo for Illustration Preference (picked from Wendy's patch)" into sc-v2-dev am: d7bf769cc4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15530295

Change-Id: I5fb53da6e34a89ed65d1abbcff0f7a6504ba6154
 2021-08-12 06:01:16 +00:00
YUKAI HUNG
d7bf769cc4 Merge "Fix typo for Illustration Preference (picked from Wendy's patch)" into sc-v2-dev 2021-08-12 05:05:06 +00:00
Wendy Sung
91f0c5938b Fix typo for Illustration Preference (picked from Wendy's patch) 
Test: Manual Build
Bug: 194819372
Change-Id: Idbc6891dc1139227e5fb5585e2aadb717d5d6205
 2021-08-12 04:01:17 +00:00
ykhung
fbbcc55fc0 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
 2021-08-12 03:59:39 +00:00
Julia Reynolds
cb3a1940a6 Limit the number of concurrent notifs appear on screen am: abe9246caa am: 273df63430 am: 86887fcb9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757

Change-Id: I6cf45299e7387c68637145195ddbbd2500e2c1cf
 2021-08-11 23:12:39 +00:00
Julia Reynolds
86887fcb9a Limit the number of concurrent notifs appear on screen am: abe9246caa am: 273df63430 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757

Change-Id: Ia192c759c3a982740fe2dcb9de9a6acdd55bfa44
 2021-08-11 22:52:21 +00:00
Julia Reynolds
8c385c261c Limit the number of concurrent notifs appear on screen am: abe9246caa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757

Change-Id: Ie041911e9cba51365fc6c26e44f6cd3c3dce60bb
 2021-08-11 22:31:14 +00:00
Julia Reynolds
273df63430 Limit the number of concurrent notifs appear on screen am: abe9246caa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531757

Change-Id: I686166bf858ec7fde221e76b28c8280decc9ec13
 2021-08-11 22:31:14 +00:00
Julia Reynolds
abe9246caa Limit the number of concurrent notifs appear on screen 
To avoid an ANR in notification history

Test: Manual; with an app with 10k recent notifications
Bug: 183712803
Change-Id: Ia1340accadf43620c7b5a2c94ca1032cfe49ea59
 2021-08-11 20:22:53 +00:00
Joshua Lewis
144f222afb Merge "Create Dialog to edit TARE factors" 2021-08-11 16:54:45 +00:00
Yuri Lin
813d923c2a Merge "Move automatic rules ("Schedules") into general DND category." 2021-08-11 14:46:19 +00:00