PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,455 Commits 1 Branch 0 Tags
caf59cbbcfc156598b35eaa63e12b0ddfc2f2b51
Commit Graph

81455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hugh Chen
caf59cbbcf [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 am: 0248e7b7cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3071e369f5c750e56e7e0d4d5819f2abf7887d5b
 2021-05-11 07:07:21 +00:00
TreeHugger Robot
872093e29d Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e am: 85410254c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I910069997b36967f62986543d99a4a7c822aae68
 2021-05-11 07:07:12 +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
Hugh Chen
0248e7b7cf [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours am: 392fb7a4f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I2dd1a71af29c8f1f680d0d7339a1b29cb7c75240
 2021-05-11 06:51:44 +00:00
TreeHugger Robot
85410254c7 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 am: 16e8c4783e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I84c496c66f968a2d4efac98aa2db61723db228b9
 2021-05-11 06:51:36 +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
392fb7a4f7 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2afcbd48ae913e348764246122dc0f0fef03ec46
 2021-05-11 06:32:11 +00:00
TreeHugger Robot
16e8c4783e Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I474d15a6db416860a5a34253a7a0ed000912bafc
 2021-05-11 06:32:04 +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
Hugh Chen
3607e825b9 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448

Change-Id: I223f7a495fa5640217ee7de19a24fa6490918336
 2021-05-11 06:24:06 +00:00
Hugh Chen
8a4f60b143 [automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I44435d83016a9c974d704cab9de7fa50df1515f3
 2021-05-11 06:18:35 +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
54f47d0953 Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447

Change-Id: I4a4c7bd80496a8fa883c895080d4d4c48a3fa3e9
 2021-05-11 06:16:43 +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
TreeHugger Robot
4074cd5e48 Merge changes Ia51528f2,Id27a7809 into qt-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:19 +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
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
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
257b3ec584 Merge "Commit changes only when activity is closed" into sc-dev 2021-05-10 02:49:31 +00:00
TreeHugger Robot
5c29b05ab3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-09 20:38:26 +00:00
TreeHugger Robot
e1aa1f04c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-05-09 20:35:21 +00:00
ykhung
28896636b0 Support old pixel devices to adopt non-clickable chart design 
For clickable devices:
https://screenshot.googleplex.com/ktBfjhhHQVYfTmF
https://screenshot.googleplex.com/BYutnpu9Dys2sa6
For non-clickable devices:
https://screenshot.googleplex.com/64NaKhRDrhfBqBQ

Bug: 185308803
Test: make SettingsRoboTests
Change-Id: I5bc0bb31946ccb20007ea31d90c05673a200e072
 2021-05-09 16:30:11 +00:00
ykhung
d8d5335096 Build a bridge to control whether the graph is clickable or not 
Create a bridge to read phenotype flag from GoogleSettings to control
whether each time slot in the graph is clickable or not.

Bug: 185308803
Test: make SettingsRoboTests
Change-Id: If8b58dcaa50ad5fb6b447ca5b7146639ee31a9df
 2021-05-09 04:46:41 +00:00
Bill Yi
ad89ad031d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia6b625e3577e40db1357ae8e8fa3f7ff41ae6081
 2021-05-08 20:19:39 -07:00
Bill Yi
3c692fcca9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib5d8a690731678d03128d9df5cde738ea4e25f2e
 2021-05-08 20:10:20 -07:00
ykhung
5b27fd923a Fix UI flashes issue when entering to the app in the cold start 
1. fix the chart % info will flash issue by deferring the showing time
until the chart content is ready to show (set default as invisible)
2. fix the category title will flash issue by set the default value as
empty to avoid refresh the title twice in the start time

Bug: 177406865
Test: make SettingsRoboTests
Change-Id: If8f247cf5b01c529bc5e4d18fcf409ba296cc2f4
 2021-05-09 01:56:09 +00:00
Treehugger Robot
e704cef070 [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 am: 8c84477a04 -s ours am: d13156d85a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie66323fe2c9c5903b5da7bb152b854ec09a9be08
 2021-05-08 23:07:35 +00:00
Xin Li
ff21be103b [automerger skipped] DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f am: c41debcf7f -s ours am: 06e9e8b3a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib023e63046bc2fc541d2a8754a544e4f17aad2a1
 2021-05-08 23:07:26 +00:00
Treehugger Robot
d13156d85a [automerger skipped] Merge "DO NOT MERGE - Merge RQ2A.210505.003." am: 7e8f5aca00 am: 8c84477a04 -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: Iccb4a95dc5c6863ea96897a392049b6ade646abf
 2021-05-08 22:45:15 +00:00