Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,554 Commits 1 Branch 0 Tags
249de94deaf6b7c7b48cf08b5969b3a80c2009b0
Commit Graph

87554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Stetson
0252189a12 Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754

Change-Id: I0540859757c43040b7ebb4c410c0156dc097706d
 2021-05-07 14:13:49 +00:00
Alex Stetson
6bce729342 Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754

Change-Id: I8451ca2a698ea037e85f069e038d7c65c5b14464
 2021-05-07 14:13:47 +00:00
Alex Stetson
b693c7949e Merge "Use shared model for non-system overlay toggle" into sc-dev am: 413893244d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441754

Change-Id: I88f9322ad1b7d886bfbf597070232d6bf6002174
 2021-05-07 14:13:07 +00:00
Alex Stetson
413893244d Merge "Use shared model for non-system overlay toggle" into sc-dev 2021-05-07 14:08:52 +00:00
Syaoran Kuo
87cc2e19e5 Add more log for debugging resource id issue. 
Bug: 187485845
Test: atest SettingsComponentTests
Change-Id: I6268809eca172b0b4aa9f1a252e0d519ad758083
 2021-05-07 18:49:26 +08:00
TreeHugger Robot
d4ddfe7496 Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05 am: adfbb68838 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999

Change-Id: I8545dbf4459c1b60a34e899aab7e2056a34c8e29
 2021-05-07 10:07:39 +00:00
TreeHugger Robot
adfbb68838 Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999

Change-Id: If33d0ec952dbf09416507db253493ce890ee00a0
 2021-05-07 09:53:41 +00:00
TreeHugger Robot
f619511195 Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999

Change-Id: Id9bd417e852a2bbc26b4d8a56b807b2f3d9e1f01
 2021-05-07 09:51:58 +00:00
TreeHugger Robot
e5ba5c68e1 Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999

Change-Id: Ie643498fd6df7d1a4bb6e96335ca98fe5bdd8387
 2021-05-07 09:51:27 +00:00
TreeHugger Robot
3808ff395d Merge "Refine the interpolation rule and clip the usage time data" into sc-dev am: 180051cf05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455999

Change-Id: Iec0daef58ede84bb9cd740a5e0e1ea4bb241d93b
 2021-05-07 09:50:32 +00:00
Edgar Wang
b54caf63f2 Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib 
Bug: 182179573
Test: robotest & manual
Change-Id: Iadb51c8601b49294eef2f6fb13369576e62e5b7a
 2021-05-07 17:41:02 +08:00
TreeHugger Robot
180051cf05 Merge "Refine the interpolation rule and clip the usage time data" into sc-dev 2021-05-07 09:35:35 +00:00
TreeHugger Robot
e2608c118b Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad am: 3fb211bc4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000

Change-Id: I81047287cc44f058d03a3209d82f9985ab30a3c2
 2021-05-07 09:29:46 +00:00
Yanting Yang
aa904a9ea2 Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb am: f94fe0e86c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216

Change-Id: I5412278f4ddafec5f700498db2bf2043f6cad663
 2021-05-07 09:29:01 +00:00
TreeHugger Robot
3fb211bc4e Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000

Change-Id: I80c2fc6bcf6863bee4636a151c018af38511d4f3
 2021-05-07 09:16:14 +00:00
Yanting Yang
f94fe0e86c Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216

Change-Id: I7058a16e5d50badbd4f18fdf7545328421475f50
 2021-05-07 09:15:42 +00:00
TreeHugger Robot
4af703e2ae Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000

Change-Id: Id40d542dcb170670037ef5dfbddadbda6d0f64ee
 2021-05-07 09:14:36 +00:00
TreeHugger Robot
097c717d9c Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000

Change-Id: I96bf13d162ee1f8823e902fb103f4f98049c23b9
 2021-05-07 09:14:26 +00:00
Yanting Yang
f93d748e39 Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216

Change-Id: Ia37803139c26349cfc0df75badd5a907c0735c26
 2021-05-07 09:14:23 +00:00
TreeHugger Robot
5e8d1554c3 Merge "Turn on the transition flag" into sc-dev am: ac1b7661ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456000

Change-Id: Iff249e22920e5e04e90920ea876b52265a6c403a
 2021-05-07 09:14:12 +00:00
Yanting Yang
eecd27406c Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216

Change-Id: Ida5e3fec18839e4ba2ce266aa5b4d2424b65ef3a
 2021-05-07 09:14:08 +00:00
Yanting Yang
0f7c4495ca Merge "Add summary back to the homepage" into sc-dev am: c37abc9edb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442216

Change-Id: Id45e5ee08848f83fab55acb2c56fecbc5bd491df
 2021-05-07 09:14:06 +00:00
TreeHugger Robot
ac1b7661ad Merge "Turn on the transition flag" into sc-dev 2021-05-07 09:01:00 +00:00
Yanting Yang
c37abc9edb Merge "Add summary back to the homepage" into sc-dev 2021-05-07 09:00:32 +00:00
Syaoran Kuo
bdb5723002 Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05 am: 84dfab789e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: I4ee81e10bbb70dcb9a8fbf813a2f424aeac4677b
 2021-05-07 08:52:49 +00:00
ykhung
4280a7f897 Refine the interpolation rule and clip the usage time data 
Bug: 184807417
Test: make SettingsRoboTests
Change-Id: I6c115beed34abd393e5c615cc59d3c4c323dfa0b
 2021-05-07 16:36:56 +08:00
Syaoran Kuo
84dfab789e Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: I28fa9b25ec03e5323198e81837bf266f28f2b02c
 2021-05-07 08:30:50 +00:00
Syaoran Kuo
283b879e3f Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: I98344c6432cbd8a2b4be4693a8296dfb031b073d
 2021-05-07 08:28:46 +00:00
Syaoran Kuo
dcffe72b50 Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: I884c941b0da10127ec9e05cd91d3134ad5f93b57
 2021-05-07 08:28:37 +00:00
Syaoran Kuo
4ec71237bb Merge "Remove wifi related test." into sc-dev am: 7dd05a8c05 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14441410

Change-Id: Idde9165abeb18ab8e348c0041ed2dce3db126b9f
 2021-05-07 08:28:14 +00:00
Syaoran Kuo
7dd05a8c05 Merge "Remove wifi related test." into sc-dev 2021-05-07 07:54:25 +00:00
Syaoran Kuo
bc1e5321ab Remove wifi related test. 
To add these case back, add a success case to avoid empty test error.

Bug: 186372528
Test: atest SettingsComponentTest
Change-Id: I6d973a244338f67e3d35e9657d1d46eba8ba4501
 2021-05-07 13:44:08 +08:00
Yi-Ling Chuang
1be773da62 Turn on the transition flag 
Test: robotests
Bug: 186701900
Change-Id: I09c821e17fca88ee532f6535031a52c4c832a1e8
 2021-05-07 13:21:42 +08:00
TreeHugger Robot
b2baeba56a Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed am: 1b2bf94780 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: Ib0a948a3325525242c9ffaa939107b3ad0688f1b
 2021-05-07 05:19:38 +00:00
Edgar Wang
116b57797b Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e am: 2b301c466f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I013ca0564c44b3713752bfb8271d20f06834f6c7
 2021-05-07 05:19:14 +00:00
TreeHugger Robot
072d0b9a2d Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: Ibc4ec9f604d045450f14d5cea8e5d11f9f4d334e
 2021-05-07 05:11:44 +00:00
TreeHugger Robot
e1c74cc330 Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: Iaf6750c802f825b48b40e0f539f578969a9213fd
 2021-05-07 05:11:19 +00:00
TreeHugger Robot
3b72e00b7a Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: I7cc7eda7d2839b92f37d91188f4507426ba336f8
 2021-05-07 05:11:14 +00:00
TreeHugger Robot
1b2bf94780 Merge "Wallet/controls - Migrate existing settings" into sc-dev am: db624992ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14353975

Change-Id: I9a72d99adc6efb84a6f48df261564d802ddde25f
 2021-05-07 05:06:19 +00:00
Edgar Wang
2b301c466f Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I0851b47122f67956784b36d2fd06075dd1e9f6e8
 2021-05-07 05:05:57 +00:00
TreeHugger Robot
db624992ed Merge "Wallet/controls - Migrate existing settings" into sc-dev 2021-05-07 05:05:34 +00:00
Edgar Wang
bee5f45d12 Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I0bd42f5e5dacb6e366af1f73f1b06d72abdf994e
 2021-05-07 05:04:06 +00:00
Edgar Wang
78f5f98a25 Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I882a9a14eccdbbf9db33f764e0db42090b62b91b
 2021-05-07 05:03:51 +00:00
Edgar Wang
bd495e0413 Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 am: febe901c8e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I873b6f6ada4e87aca2231259b5701aef940323d0
 2021-05-07 05:03:51 +00:00
Edgar Wang
febe901c8e Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 am: b4ada164a0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: If3b1222631f8ed62b4499f6be5d3a4947a86f5cf
 2021-05-07 04:49:18 +00:00
Joe Bolinger
955c8349ed Prevent multi-sensor enrollment from doing nothing. 
Fix: 186499864
Test: manual (setup with managed account)
Change-Id: If2b2623b2e348ef9d335c81189dbe23e4fe5f003
 2021-05-06 21:41:43 -07:00
Suprabh Shukla
ce53343669 Commit changes only when activity is closed 
The consequences of revoking the permission are irreversible so delay
committing until the user navigates out of the activity.

Test: Manual

Bug: 186280600
Change-Id: Ib53496fd4e39fe15dca4aadc5bcc773d5433131c
 2021-05-06 21:39:09 -07:00
TreeHugger Robot
3bfdd162a8 Merge "Fix the battery usage screen left alignment issue" into sc-dev am: 8642ee35ad am: 947f4d458a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14455997

Change-Id: I81e768c6d277bc40b831267e3d4428f21af4149d
 2021-05-07 04:36:08 +00:00
Treehugger Robot
3a39be999a Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c am: 026ecdd388 am: e24cba9b59 am: 151435a12f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: Id67f3b2620a905b0b05c696fb629afd2d1d5ec15
 2021-05-07 04:34:19 +00:00
Edgar Wang
b4ada164a0 Merge "Add personal dictionary summary text" am: 0cbc974638 am: 7106d10dd0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: I9e7e25716d18b62a38250d6b02c2794cc2046886
 2021-05-07 04:32:55 +00:00