Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
104,591 Commits 1 Branch 0 Tags
05e75b5f239b1a724e726a0120c62eefe2103d3c
Commit Graph

104591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
65fd2107ef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ied44f5fe1916711c2935c9fc8ebd58af9ab529c1
 2022-04-06 23:41:51 +00:00
Bill Yi
7f85a55285 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62dd76e7d4 2p: 47e0304cea 
Blank merge reason: parent was merged -s ours

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

Change-Id: I98135d67554fd082c3b170346a0e9cf950d87b83
 2022-04-06 23:40:38 +00:00
Bill Yi
47e0304cea [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 62dd76e7d4 
Blank merge reason: commit message contains skip directive

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

Change-Id: Iff713f75feef96eb93b863847cb996f0e709bf94
 2022-04-06 23:40:28 +00:00
Bill Yi
62dd76e7d4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib47f53297c83360071064bfed2de9c5b2c0ec7a3
 2022-04-06 23:40:15 +00:00
TreeHugger Robot
0328978e63 Merge "[Panlingual] Fix settings crash from rotation." into tm-dev am: e0f6939c4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Change-Id: I33d6a4c5eb6d99073a5b4f5ce0d86f2647a81c04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:53:58 +00:00
tom hsu
0ce8355c63 [automerge] [Panlingual] Fix the back button press 2p: c0214ff9f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615237

Bug: 226894999
Change-Id: I81b99b74f45acdd9f7073aea1d4f5bebd1cd13b1
 2022-04-06 15:37:24 +00:00
tom hsu
c0214ff9f3 [Panlingual] Fix the back button press 
Bug: 226894999
Test: local
Change-Id: I81e6408ebf2587bd023a13dbbdfa97e38efd8c31
 2022-04-06 23:28:17 +08:00
TreeHugger Robot
e0f6939c4c Merge "[Panlingual] Fix settings crash from rotation." into tm-dev 2022-04-06 15:15:37 +00:00
TreeHugger Robot
8f16b0cd5b Merge changes from topic "presubmit-am-9c41bb9c971547b49c41b3d37ad42e21" into tm-mainline-prod 
* changes:
  [automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c
  [Panlingual] Fix settings crash from rotation.
 2022-04-06 15:15:37 +00:00
Xiaowen Lei
16cbd39800 Merge "Update the function used to log the dream picking events." into tm-dev am: 8708bbd8b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17543375

Change-Id: I629d4fd3dd3a23b0a8c0c6f568f7e70e88a96bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:08:11 +00:00
TreeHugger Robot
9190579a6d Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: I313128fc5febe16ad2fe6b6c92580053b2da9212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 15:07:57 +00:00
Xiaowen Lei
8708bbd8b3 Merge "Update the function used to log the dream picking events." into tm-dev 2022-04-06 15:04:57 +00:00
TreeHugger Robot
59d390cded Merge changes from topic "presubmit-am-185f63f128a54648a022e31b749710e8" into tm-mainline-prod 
* changes:
  [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2
  Fixes 'learn more' link in ScreenTimeoutSettings
 2022-04-06 15:00:11 +00:00
TreeHugger Robot
d23aa91e8b Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev 2022-04-06 15:00:11 +00:00
Chaohui Wang
cc4a5988f5 Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev am: 9c6249a04f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Change-Id: I824aad92c5318f1da55e389ce1145321aa9d5837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 14:59:21 +00:00
Chaohui Wang
9c6249a04f Merge "Fix the flow for ZenCustomRuleSettingsBase" into tm-dev 2022-04-06 14:35:51 +00:00
Chaohui Wang
2caba70028 Merge changes from topic "presubmit-am-2fdd9a2ee9c448a893b219cbddd5e04a" into tm-mainline-prod 
* changes:
  [automerge] Fix the flow for ZenCustomRuleSettingsBase 2p: 3b3e66c780
  Fix the flow for ZenCustomRuleSettingsBase
 2022-04-06 14:35:51 +00:00
tom hsu
d36ff21fb1 [automerge] [Panlingual] Fix settings crash from rotation. 2p: 19bd21d96c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615231

Bug: 228126890
Change-Id: I9d11e77c5cc04810e66f2223f4bb54897f4fed6c
 2022-04-06 11:33:59 +00:00
tom hsu
19bd21d96c [Panlingual] Fix settings crash from rotation. 
- View may not create in time when add view of fragment.

Bug: 228126890
Test: local test.
Change-Id: Idce63dc9d39de09ff1ee684881ea6cb90637ee22
 2022-04-06 19:32:36 +08:00
Presubmit Automerger Backend
9d162016b9 [automerge] [Pnalingual] Resolve code conflict. 2p: 6436a5aa6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615234

Bug: 228292561
Change-Id: I889b195579da6dda07bb5f186a59f5a7f0fa8c08
 2022-04-06 11:07:55 +00:00
tom hsu
6436a5aa6f [Pnalingual] Resolve code conflict. 
Bug: 228292561
Test: local
Change-Id: Idc79694fdecf3ad64e93e2f353837fd7bbdde1ed
(cherry picked from commit aac21a59aa)
 2022-04-06 11:07:22 +00:00
Edgar Wang
6622811a75 [automerge] Fix LaunchAnyWhere in AppRestrictionsFragment 2p: 90e095dbe3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17614846

Bug: 223578534
Change-Id: Ie4e4825ea8c9020986f59d59c31f40765e5d92a7
 2022-04-06 10:02:31 +00:00
Jan Tomljanovic
ba369cbb31 Merge "Update framework strings for the security page." into tm-dev am: a926f6ddbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17567139

Change-Id: I162b571a63526a1118608ac47ecc0455add8d785
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 09:59:17 +00:00
Edgar Wang
90e095dbe3 Fix LaunchAnyWhere in AppRestrictionsFragment 
If the intent's package equals to the app's package, this intent
will be allowed to startActivityForResult.
But this check is unsafe, because if the component of this intent
is set, the package field will just be ignored. So if we set the
component to any activity we like and set package to the app's
package, it will pass the assertSafeToStartCustomActivity check
and now we can launch anywhere.

Bug: 223578534
Test: robotest and manual verify
Change-Id: I40496105bae313fe5cff2a36dfe329c1e2b5bbe4
 2022-04-06 17:51:07 +08:00
Jan Tomljanovic
a926f6ddbc Merge "Update framework strings for the security page." into tm-dev 2022-04-06 09:25:15 +00:00
Chaohui Wang
2646ea3180 [automerge] Fix the flow for ZenCustomRuleSettingsBase 2p: 3b3e66c780 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17615233

Bug: 226523115
Change-Id: If37ebc4a3eaec779ddad315789ebd858aec684f0
 2022-04-06 09:22:39 +00:00
Chaohui Wang
3b3e66c780 Fix the flow for ZenCustomRuleSettingsBase 
updateRule() should be called before super.onResume() because rule will
be used in updatePreferenceStates() in super.onResume().

This is follow up of Change: Ief9963091847d58654f26851616563ae910716a5

Bug: 226523115
Test: manual
Change-Id: I2fe0cfb2b4a76273283bb2d3aca629b5d647db91
 2022-04-06 17:22:12 +08:00
Cn Chen
87b8c8d107 Merge "Properly apply the SUW dynamic color theme" into tm-dev am: 8b6bbda28a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17536304

Change-Id: Iee7a70d91d7ef77cd1a0d39a30c7eed5f0a9f8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 09:17:28 +00:00
Cn Chen
8b6bbda28a Merge "Properly apply the SUW dynamic color theme" into tm-dev 2022-04-06 08:55:48 +00:00
TreeHugger Robot
1f75850e11 Merge "Add work profile badge for icon of free up space" into tm-dev am: 6d0b9c7bd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17462163

Change-Id: Ie55415540cda4898f0b37f0ff3c9d69f278b91aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-06 08:34:49 +00:00
TreeHugger Robot
6d0b9c7bd4 Merge "Add work profile badge for icon of free up space" into tm-dev 2022-04-06 08:05:10 +00:00
Yi Jiang
e6f28fbd49 [automerge] Fixes 'learn more' link in ScreenTimeoutSettings 2p: 284cb1c2b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Bug: 227292811
Change-Id: Ibab34cc241b50c473e6951d46f6be1697bfadb03
 2022-04-06 06:49:32 +00:00
Yi Jiang
284cb1c2b2 Fixes 'learn more' link in ScreenTimeoutSettings 
Bug: 227292811
Test: make RunSettingsRoboTests

Change-Id: I0e5678e6760ebd590dfd526f362207776ece3a70
 2022-04-06 06:49:19 +00:00
Chaohui Wang
5d0057615a Fix title clipped for "Custom settings for schedule" 
Set rule to header, switch and action buttons controllers before their
isAvailable() is called in onCreate().

Fix: 228262001
Test: manual
Change-Id: Idc0ea779ab768497a8426ac847c4bbb2c6c4faea
 2022-04-06 13:57:48 +08:00
Peiyong Lin
f621f13d83 [automerge] Remove GameSettings and ExtraAppInfo. 2p: e14c23fcf9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: I12ee20fe9ccf469eaa2a0d67b605ec1d952cd585
 2022-04-05 21:51:57 +00:00
Peiyong Lin
e14c23fcf9 Remove GameSettings and ExtraAppInfo. 
Bug: b/224595815
Test: manual
Change-Id: Ifc9a9e8c0b4b2170144639abb2f81f8916d5f164
 2022-04-05 21:45:05 +00:00
Lucas Silva
2ec4bc0b5d Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev am: ab8467e872 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17574303

Change-Id: I70b3d13f08d501f761e9f733997a5aeba56e9647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 15:13:02 +00:00
Lucas Silva
ab8467e872 Merge "Fix bug where not all views are getting disabled alpha applied." into tm-dev 2022-04-05 14:42:41 +00:00
Jan Tomljanovic
b8187256eb Update framework strings for the security page. 
Test: manual
Bug: 226098547
Change-Id: Idf31853fc65aaef241de1bbcabc33fceabe2fd3a
 2022-04-05 15:20:46 +01:00
Chaohui Wang
20032a4b13 Merge "Fix cannot add language" into tm-dev am: 65c610c2ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539527

Change-Id: I1f427300d8ee35d800c102efa1c58bf2cf6a58f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 11:29:19 +00:00
Chaohui Wang
65c610c2ab Merge "Fix cannot add language" into tm-dev 2022-04-05 11:04:10 +00:00
Chaohui Wang
9734698f71 Fix Flicker for ZenCustomRuleSettingsBase am: bab799899d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17374483

Change-Id: I119d33ca9d3fa7345fb2f5efbc6a7c0327da0d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-05 08:36:58 +00:00
Lucas Silva
f7a95e4b5d Fix bug where not all views are getting disabled alpha applied. 
This ensures that we apply the alpha recursively to all views when the
item is disabled/enabled.

Bug: 226573932
Test: locally on device
Change-Id: I28ee1a21227706d01a6e4f6284871bf78af983f5
 2022-04-04 17:32:05 -04:00
Giulio Fiscella
7afcf4efdb Use more unique ids for safety sources 
Test: atest SettingsUnitTests
Bug: 227291608
Change-Id: I8815d14fc402cd25bcf49848c86e21ded552a542
Merged-In: I8815d14fc402cd25bcf49848c86e21ded552a542
 2022-04-04 16:46:26 +00:00
Giulio Fiscella
1a37275553 Use more unique ids for safety sources 
Test: atest SettingsUnitTests
Bug: 227291608
Change-Id: I8815d14fc402cd25bcf49848c86e21ded552a542
 2022-04-04 15:53:56 +00:00
Chaohui Wang
bab799899d Fix Flicker for ZenCustomRuleSettingsBase 
Fix the following flicker on pages under:
Notifications -> Do Not Disturb -> Schedules -> [One Schedule]

1. Do Not Disturb behavior
2. (1) -> Create custom settings for this schedule
3. (2) -> Calls
4. (2) -> Messages
5. (2) -> Display options for hidden notifications
6. (4) -> custom

Fix: 226523115
Test: On Pixel Phone
Change-Id: Ief9963091847d58654f26851616563ae910716a5
 2022-04-04 22:22:10 +08:00
Yuri Ufimtsev
e2dd5d9fdd Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17504393

Change-Id: I3391b16ed53e2a573235b57d25dabfd206eb46ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-04 10:52:48 +00:00
Yuri Ufimtsev
d191a16c54 Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev 2022-04-04 10:33:09 +00:00
Chaohui Wang
f03f79b145 Fix cannot add language 
Fix: 227972634
Test: manual
Change-Id: I3382879e51238be55687072eeb07bb553dafc952
 2022-04-04 11:26:55 +08:00
Xin Li
7f998a1b5b [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e75d9ee3e9 -s ours am: 35cf5330a9 -s ours am: 444e9d38f6 -s ours 
am skip reason: Merged-In I50e3649c21bb83ee9130fa98a71560fe261198a9 with SHA-1 6ca8dd1b1a is already in history

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

Change-Id: If8a994473492cd2acc448c32d7e73e8685e00048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 08:29:33 +00:00