PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,619 Commits 1 Branch 0 Tags
51096e5b8ecd0889935e1ec3de6b5fe53e835a20
Commit Graph

82619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugh Chen
51096e5b8e [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: ac30bfef8c -s ours am: 7eeee9be6a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iea1471f652da72279503e71a20671cab368297da
 2021-05-11 07:30:52 +00:00
Hugh Chen
7eeee9be6a [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 am: ac30bfef8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3433db790942e4b64ee00dbfe6636a2fbfd53841
 2021-05-11 07:07:10 +00:00
TreeHugger Robot
8b677c1610 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: I3d1050ba3ab20740e5e929b60f4126a2a6ae75bf
 2021-05-11 06:58:21 +00:00
Hugh Chen
7d10908f2a [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 5de62d1955 am: e914289a2c -s ours am: 810abfc77b -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: I7ddcab99def3c04357a3da269408a8fcc64f5666
 2021-05-11 06:58:20 +00:00
Wesley.CW Wang
481473a2f3 Fix color check error am: 7a8d2f4486 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14493679

Change-Id: Ia7b8e52a727787297800efabfaee46541a04a14d
 2021-05-11 06:58:06 +00:00
Hugh Chen
ac30bfef8c [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours am: effac8a0c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I6e234e32dc4c51a3fd4bccdf8bce71a0fe65577d
 2021-05-11 06:51:35 +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
Hugh Chen
effac8a0c1 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib65fe3dd30eb3dd84a2f4949de6eaa32f2b24146
 2021-05-11 06:32:02 +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
Hugh Chen
7b05629834 RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I7256d5f30d6c4b3063181a768b5d3796cf517383
 2021-05-11 06:16:42 +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
f8d7036bcb 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: If0210c8d87497fce595a13025a2bc69235f43981
 2021-05-11 04:04:31 +00: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
66735de547 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: I083254cc4165b4dc1ef189fa7acbdf5f39042f75
 2021-05-11 02:55:35 +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
cdf99ec2da 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: I7567c92a1ecef0e8381ea38805df4e3ca92558ec
 2021-05-10 17:17:52 +00:00
Wesley Wang
180e63c0b8 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: I9fa451611e4abfab6cfcbf25864485b28ca6e7e3
 2021-05-10 17:17:07 +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
044aeb767d 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: I5451f21c6519f20050e981ab868f233adeefb393
 2021-05-10 16:02:20 +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
74f49b0ec9 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: I327dc293b5441ff010e931feaacc11125f28f780
 2021-05-10 13:43:42 +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
74630178be Update battery status good icon color am: 021e6b131f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14456012

Change-Id: I618bd223f7dfa3711969d44f5b3f7413d162f902
 2021-05-10 13:16:43 +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
3a5b0d10fe 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: I116e5f2e4f02b620513fd5b6d08eaa131f438b55
 2021-05-10 08:54:05 +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
0201ec9a70 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: I808b2fdb6970e6ce810b0dd5e0f28241f239df14
 2021-05-10 07:34:14 +00:00
Syaoran Kuo
8365ecf321 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: I8a7ca6ae3089e820c84dc0c7f75ba319a5953f2a
 2021-05-10 07:34:01 +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
TreeHugger Robot
541feb1c09 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: I5836a10fa8c0ba2d64d1b059ef52b62b2964c119
 2021-05-10 06:19:16 +00:00
Bill Yi
a890e138d7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-05-10 06:13:23 +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
Weng Su
787edc7fd6 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: If1522799983b816d12f6f8312d4aec158ca7a3fc
 2021-05-10 05:42:37 +00:00
Weng Su
72c3debb0b Merge "[Provider Model] Add progress bar to internet panel" into sc-dev 2021-05-10 05:28:15 +00:00
Weng Su
c407a2d9f8 [Provider Model] Add progress bar to internet panel 
- Show progress bar when Wi-Fi scanning

- Show "Searching for networks..." sub-title when Wi-Fi scanning

- Remove "Wi-Fi" from searching networks string

Bug: 178774497
Test: manual test
atest -c InternetConnectivityPanelTest
make RunSettingsRoboTests ROBOTEST_FILTER=PanelFragmentTest

Change-Id: Ic05b939bef3b106845fe90db41eb09f0e15756f4
 2021-05-10 05:27:59 +00:00
YUKAI HUNG
7307e04ef2 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: I8e2ca4eabdd2ecfb9951156847b31681789dda89
 2021-05-10 04:00:54 +00:00
YUKAI HUNG
48535ffd29 Merge "Support old pixel devices to adopt non-clickable chart design" into sc-dev 2021-05-10 03:44:31 +00:00
TreeHugger Robot
92519a6c95 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: I9a5fa5f3053b726e691af4ce36d4b12b035e7853
 2021-05-10 03:06:19 +00:00
TreeHugger Robot
257b3ec584 Merge "Commit changes only when activity is closed" into sc-dev 2021-05-10 02:49:31 +00:00
TreeHugger Robot
1a75cfbee4 [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: I534b1e08598c2501cbd02021ee7bdf65dba59b6b
 2021-05-09 21:23:16 +00:00