Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,431 Commits 1 Branch 0 Tags
57ced04e3057ee4f2b0827d77f4bd0256b9d1971
Commit Graph

82431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
57ced04e30 Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d am: a5d3b8a45c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: I2657fd8f2674763a59a18c3182cdd8a13d16deae
 2021-05-11 16:29:06 +00:00
Hugh Chen
6340f5023a [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 am: e914289a2c -s ours am: 810abfc77b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Ie849ad46c439d1b5456c21a4aa62a746f2eb65fa
 2021-05-11 16:29:05 +00:00
Wesley.CW Wang
00d3eadbe4 Fix color check error am: 7a8d2f4486 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493679

Change-Id: I828664032fb2cdeac4edc2aa2024d55662ae6f79
 2021-05-11 16:28:33 +00:00
YUKAI HUNG
ad76d9971e 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: I32e8ffaf706a393d8b0a7ea8b023a4f62da57c05
 2021-05-11 16:27:59 +00:00
Jason Chiu
4765dd2849 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: I00b258a624caa218ea71732a3d3209624dc3cbf3
 2021-05-11 16:27:47 +00:00
Wesley Wang
2c3ba9e13c 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: Ic5f6d49324323bd06104edb984289bf599ac2072
 2021-05-11 16:27:04 +00:00
Wesley Wang
3152423de2 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: I4ff4ac9bc77826e57b0c5f751bc8fbdb2d9539dd
 2021-05-11 15:48:23 +00:00
Julia Reynolds
1d90527fbe 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: I3fd8fa7f47be72c54d140ed987f0226f483d0ffc
 2021-05-11 15:21:54 +00:00
TreeHugger Robot
57d2131a8a 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: I3a983a334a4d0b998eaa6244a89a2f2f3890d96f
 2021-05-11 15:15:47 +00:00
Wesley.CW Wang
b9599ae39a Update battery status good icon color am: 021e6b131f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456012

Change-Id: I8beecf2237ea359ab8bf4cf981527463c47b589c
 2021-05-11 15:15:42 +00:00
Tom Hsu
e6615a63db 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: I23343902a67a9b8c2473349bbf9348fd18adb999
 2021-05-11 15:15:38 +00:00
Ryan Lin
a02e977d36 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: I7c63e0c8f623d687be25aa97e4123dcf99c50618
 2021-05-11 15:15:32 +00:00
Syaoran Kuo
2cfe02b17b 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: I339c77e534e8693c94c0957e9e320962901cbcc7
 2021-05-11 15:15:27 +00:00
TreeHugger Robot
d0fdb0f74c 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: I5bbdde03e6f815ce126cda645c8075b0b6ef8e65
 2021-05-11 15:15:11 +00:00
Weng Su
0ebc4df04e Merge "[Provider Model] Add progress bar to internet panel" into sc-dev am: 72c3debb0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14442219

Change-Id: I38371cdcb84bb9059e074ba96c308688702dc863
 2021-05-11 15:14:56 +00:00
YUKAI HUNG
ab67b7ba2c Merge "Support old pixel devices to adopt non-clickable chart design" into sc-dev am: 48535ffd29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456009

Change-Id: Ia75bf4c608056b7fd2f1b9a012a96abab9802f9d
 2021-05-11 15:14:51 +00:00
TreeHugger Robot
7ed6723639 Merge "Commit changes only when activity is closed" into sc-dev am: 257b3ec584 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14463203

Change-Id: I05845e400b37d042405b6dd7e33fe8210c7cded2
 2021-05-11 15:14:46 +00:00
TreeHugger Robot
9cc20b1617 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 5c29b05ab3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01ea2cec901be9a17b6834f2fe4ac5b56584f946
 2021-05-11 15:14:29 +00:00
TreeHugger Robot
1eec0a6df3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: e1aa1f04c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab3886bdbf2e294c0d8e3ad93d29860e6f2c9001
 2021-05-11 15:08:41 +00:00
ykhung
c6d1eba0df Build a bridge to control whether the graph is clickable or not am: d8d5335096 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456008

Change-Id: If50bf5e3699557b381b759c3e6bceff0b86f0c1a
 2021-05-11 15:08:35 +00:00
ykhung
985ac984c3 Fix UI flashes issue when entering to the app in the cold start am: 5b27fd923a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456007

Change-Id: I072d5e9948792fed6467831e31416b7d416296e6
 2021-05-11 15:08:29 +00:00
Treehugger Robot
3343c61755 [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 am: 8c84477a04 -s ours am: d13156d85a -s ours am: e704cef070 -s ours 
am skip reason: Merged-In I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is already in history

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

Change-Id: I5a21a7bb6d8c510a6152b1eddf3d67d568a3c7b8
 2021-05-11 15:03:33 +00:00
Xin Li
437cc02e8e [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours am: 06e9e8b3a9 -s ours am: ff21be103b -s ours 
am skip reason: Merged-In I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e0f8214e80 is already in history

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

Change-Id: I81f45f7074832d4b534b5773a0f55c87b66a9340
 2021-05-11 15:03:31 +00:00
Yu-Han Yang
8055e0909a Merge "Revert "Remove dynamic location settings footer"" into sc-dev am: f730edaaac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14443640

Change-Id: Ifb268c34e6b1e77197e565eeea103e8ed801273d
 2021-05-11 14:58:59 +00:00
Curtis Belmonte
a384cee63c Merge "Revert "Turn on the transition flag"" into sc-dev am: 5ece4babd3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14471733

Change-Id: I7e97f4b933d7d9d90cca53bd3e702c21a3fb6e10
 2021-05-11 14:57:49 +00:00
Edgar Wang
9790762101 Merge "Rename PreferenceTheme.SettingsBase to PreferenceTheme.SettingsLib" into sc-dev am: 9da824db15 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456003

Change-Id: I56bde38153b1e9371418f6c74e7fe188ab4971bb
 2021-05-11 14:57:32 +00:00
TreeHugger Robot
5113155194 Merge "Controls/Wallet privacy settings" into sc-dev am: 67fd37c837 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470513

Change-Id: Iff0120d038448d3e739a93a9cf8ff90917be2c2b
 2021-05-11 14:57:15 +00:00
Xin Li
6f8f1260d8 [automerger skipped] Merge "DO NOT MERGE - Mark RQ2A.210105.001 as merged." am: 6811428c9c -s ours am: 1b68f3bfd3 -s ours am: a7d220aad7 -s ours am: e49a0d1b4e -s ours 
am skip reason: Merged-In Ic91dd36f6de39ef79f1ced90083e1c5c7836c651 with SHA-1 6f3630c393 is already in history

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

Change-Id: I9b275f79563f16e7ee16141e9f51aec9e17c787e
 2021-05-11 14:53:55 +00:00
TreeHugger Robot
a5d3b8a45c Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Ieff4517231297944d0e8ea8234863944b38e4aa2
 2021-05-11 06:41:34 +00:00
Hugh Chen
810abfc77b [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 am: e914289a2c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69468fc4b6059967865fe3f0aa7f003d5b56914b
 2021-05-11 06:41:32 +00:00
TreeHugger Robot
cb2b575a9d Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442

Change-Id: Iaf718af21458079e30afc205e0888bb7e1da58ca
 2021-05-11 06:18:12 +00:00
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
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
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
7a678f29b2 Merge "Add searchable keywords for new usage and adaptive preferences screen" into sc-dev 2021-05-11 03:47:58 +00:00
Jason Chiu
0c2fa9cd69 Merge "Apply the new search bar background color" into sc-dev 2021-05-11 02:42:08 +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
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
9cb5ab3860 Merge "Fix work profile setting appearing too often" into sc-dev 2021-05-10 13:26:31 +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
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
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
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
TreeHugger Robot
57d8d38a3c Merge "Merge existing bundle with ActivityOptions" into sc-dev 2021-05-10 06:05:37 +00:00
ryanlwlin
95616af6fa Fix Punctuation inconsistency in the Magnification shortcut pop up 
The incorrect punctuation affects localization.

Bug: 187216931
Test: build pass
Change-Id: I2f2b66674946a6e5848a1879a24cb5aaddbfdc82
 2021-05-10 13:52:19 +08:00