Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72,473 Commits 1 Branch 0 Tags
3166166bdda3a8cbdb9655eb375bd67c4bec69ce
Commit Graph

20792 Commits

Author SHA1 Message Date
Bill Yi
77c6ea6e80 Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE 
Merged-In: I1f20e829bf513d8166458e1749bcc8c9fade07b2
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Change-Id: Icad4036f299d2b082cc617b82f9f900a0f23aa96
 2021-09-08 17:57:10 -07:00
Xin Li
27ade80e6b DO NOT MERGE - Merge RQ3A.210805.001.A1. 
Bug: 192585466
Merged-In: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
Change-Id: I2bf4a9589a121a8bc2d2c4680a1fa081784a2e8a
 2021-08-03 16:07:50 -07:00
Jack Yu
cfb0bbc0d0 Revise strings for the NFC developer option 
Bug: 187083201
Test: build pass
Change-Id: Id90627235dbdb714d13a78b61826bafeb9f80360
 2021-07-12 16:39:22 +08:00
Treehugger Robot
9d7b0beb87 Merge "Add a developer option to increase nfc stack log level" 2021-07-06 08:05:47 +00:00
Treehugger Robot
88d39847b9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-04 16:00:20 +00:00
Bill Yi
ac0886d754 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id854c59331a03cf9a05828b1062e3c750c8603ba
 2021-07-03 18:45:56 -07:00
Bill Yi
18708c4f00 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iac0b5598da3ee6dedf95d2cb9f6e32109d9f19af
 2021-07-03 18:42:49 -07:00
Hugh Chen
18c83959b1 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message 
This CL add more prompts presented for users to avoid phishing attacks.

Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png

Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
(cherry picked from commit 10e4599219)
(cherry picked from commit 80d8b03d02)
 2021-06-30 23:59:30 +00:00
Hugh Chen
4217584da9 RESTRICT AUTOMERGE Update string 
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"

https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637

Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests

Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5)
(cherry picked from commit f4f2fae306)
 2021-06-30 23:59:26 +00:00
Treehugger Robot
b34692c2b5 Merge "Settings: use framework text colors for SwitchBar" am: b09a17bc9e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708559

Change-Id: I84406695c1822ccda20b74b35ea18a2d51487119
 2021-06-16 15:18:06 +00:00
Treehugger Robot
b09a17bc9e Merge "Settings: use framework text colors for SwitchBar" 2021-06-16 14:59:18 +00:00
Chen Xu
f74bb461d5 UK emergency alert app rename 
Bug: 179052608
Test: Build
Change-Id: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
(cherry picked from commit f7e3d57023)
Merged-in: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
(cherry picked from commit 3b8c6118c1)
 2021-06-16 01:11:37 +00:00
Jack Yu
9deb600326 Add a developer option to increase nfc stack log level 
Easier to increase nfc stack log level.

Bug: 187083201
Test: enable/disable from developer option and check nfc log
Change-Id: I0675cbd535a2faf3b77b2842b03b7fb3b1b782fa
 2021-06-11 00:37:14 +08:00
Timi Rautamäki
c640453297 Settings: use framework text colors for SwitchBar 
* Use framework text colors for SwitchBar also on
   dark mode to properly display disabled colors.
 * Before the patch, a disabled SwitchBar on dark
   mode would look same as an enabled one.

Test: open ´Notifications´-menu of a system app,
      verify SwitchBar text is gray in dark mode.
Signed-off-by: Timi Rautamäki <timi.rautamaki@gmail.com>
Change-Id: Ia2fc5eb3f614d899cb5e519c235f1ea9b86a1527
 2021-05-15 11:02:36 +02:00
Treehugger Robot
a2dc65e71e Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889

Change-Id: I966b9ede97c0d3e997b96dc012ffdd6476688448
 2021-05-14 04:38:14 +00:00
Treehugger Robot
a3da419c8d Merge "Device picker: add title to fix offset in progressbar" 2021-05-14 04:12:44 +00:00
Xin Li
c41debcf7f DO NOT MERGE - Merge RQ2A.210505.003. am: bb6f5b264f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1700137

Change-Id: I7325883698b037f16083f2dfa39db84feb21f698
 2021-05-08 22:00:38 +00:00
Xin Li
bb6f5b264f DO NOT MERGE - Merge RQ2A.210505.003. 
Bug: 187544653
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Change-Id: I9a8ebe5b65b682015225c8c1ba9de1984bac7a8d
 2021-05-07 23:32:36 -07:00
Edgar Wang
7106d10dd0 Merge "Add personal dictionary summary text" am: 0cbc974638 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1683874

Change-Id: Ie7686e0df4f0e44bdb1dcb2d55a21e0c957d65b2
 2021-05-07 04:18:17 +00:00
Edgar Wang
0cbc974638 Merge "Add personal dictionary summary text" 2021-05-07 04:02:00 +00:00
Timi
06af9f9005 Device picker: add title to fix offset in progressbar 
* Add a title to device picker fragment in order to
   move the progressbar to the correct place

Test: make Settings, share a file via Bluetooth,
verify progressbar is properly placed

Change-Id: I2fcf293ed2d70d123d65cf76051a6d7d745a773b
Signed-off-by: Timi Rautamäki <timi.rautamaki@gmail.com>
 2021-04-24 08:43:41 +00:00
Treehugger Robot
acc37353d7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 20:01:33 +00:00
Treehugger Robot
5d68dc45b3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:24:09 +00:00
Bill Yi
86cf8dc82f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I74a0174984401e63ae86978bb3d472cb6422c1ce
 2021-04-22 10:33:24 -07:00
Bill Yi
183d5436b6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I670023c95e90df9d083ad0359c70b19195ccfb02
 2021-04-22 10:31:33 -07:00
Bill Yi
fbcfe8af01 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I814358b71ad2829789f1d9ac0711e369dddd11e4
 2021-04-22 10:28:15 -07:00
Daniel Hunt
8d50393223 Add personal dictionary summary text 
The resource id 'user_dict_settings_summary' was used to display
summary text of personal dictionary in Froyo. But from GingerBread it
is not used and an empty string is set.
Display above resource as summary text of personal dictionary entry.

Bug: 152970252
Test: Manual
Change-Id: Ib2d6abe1c128d2c7519be2017880cd2d53c026f3
 2021-04-22 18:26:31 +02:00
TreeHugger Robot
d9eda0aed1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-30 06:24:26 +00:00
Bill Yi
0b2ae5a68f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5ede9d88bd047f9d7a5f2f932736593beda3d3af
 2021-03-29 19:58:30 -07:00
Bill Yi
bb332bcf06 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibc4689e62ec0e346015676571e920106ac05960a
 2021-03-29 19:09:43 -07:00
TreeHugger Robot
b004856084 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-27 07:00:50 +00:00
Bill Yi
9d39189020 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I255c64ba434ed52927c5ba5e93d2c04a9c455efc
 2021-03-26 22:00:29 -07:00
Bill Yi
93b834142b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie8e82cf7a7a752585e7e9e396004b0e88581b705
 2021-03-26 21:11:53 -07:00
TreeHugger Robot
21802a4598 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-23 04:35:07 +00:00
Bill Yi
927aaac8f6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1948338eeed22ea232872da2e8ecfc80c86fd5a2
 2021-03-22 21:34:18 +00:00
Bill Yi
01da19f6a4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icad99664d1ec79ef02031537bb9a1ca851641757
 2021-03-22 21:04:30 +00:00
Peter Wang
66fd9dbad2 Added an option in reset menu in Settings to enable resetting Euicc data 
only

Bug: 159650638
Fix: 159650638
Test: Local
Change-Id: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
Merged-In: Ia260b47a4dd0ddf0363740891b5e1d818c8631b7
 2021-03-17 15:47:48 -07:00
Bill Yi
5f062373bd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9c6912b3ddd71aeecf639f628f15d04723ffea1d
 2021-03-14 19:39:14 +00:00
TreeHugger Robot
36288fc240 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-03-11 18:43:56 +00:00
Bill Yi
0bd6866b6e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4858792cf94ada11fa80e777d321ac02f7259353
 2021-03-10 23:33:56 -08:00
Bill Yi
2e4d6058d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id310e8b22e9d0d422e66ebf61b7bde73ef537abc
 2021-03-10 22:46:02 -08:00
Meng Wang
0b31d30218 Merge "Use string "Carrier settings version"" am: 2161d17f32 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606873

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cbb0cd3d4c4726587082ecc4cbbfa2957e60467
 2021-02-25 00:10:09 +00:00
Meng Wang
3f9db799e5 Use string "Carrier settings version" 
.. instead of "Settings version".

Bug: 160843335
Change-Id: Ie98b9f2c62627c1e34dfa807357625b483577305
Test: make
 2021-02-24 21:15:08 +00:00
Xin Li
ad3fa60e26 Merge ab/7061308 into stage. 
Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
 2021-02-21 09:25:11 -08:00
Bill Yi
acf789f35a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9f6118a293ecb1c5d671398e9253e8908cf18c94
 2021-02-12 04:56:56 -08:00
Hugh Chen
a1669905f1 RESTRICT AUTOMERGE Update String 
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
(cherry picked from commit 085f70d48d)
 2021-02-09 20:19:35 +00:00
Hugh Chen
6d996e0138 DO NOT MERGE: resolve merge conflicts of c17ec818af to rvc-qpr-dev 
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Iec4d1963e626829b696c2047c5979a684119acf7
Merged-In: Iec4d1963e626829b696c2047c5979a684119acf7
(cherry picked from commit dc2b694a54)
 2021-02-09 01:24:35 +00:00
TreeHugger Robot
42f0c09a95 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-02-08 04:28:36 +00:00
Bill Yi
94fc64396b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I68d5c5e5ec56489504224bdd9e431bb96555d6de
 2021-02-07 19:27:59 +00:00
Bill Yi
857a2e0052 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ieee517e48487579ff5ce29f1aaf4ab7cae860688
 2021-02-07 18:58:53 +00:00