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

20736 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Alex Salo
72dad8bc9d Merge "Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment" am: d1b9b7f87f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1552081

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafddf0eb17f24f4b0c845411092ed8c6c36fbbd5
 2021-02-05 00:25:15 +00:00
Abel Tesfaye
2babd2d36a Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment 
Test: locally with phone
Change-Id: I73663cd3e9e86431a9264925661159fbcd16b9d3
Merged-In: I931aabaada09c87b4a7936bcde4fcff8bc237dd0
 2021-02-04 22:07:08 +00:00
TreeHugger Robot
d2a2867d85 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-01-03 05:10:18 +00:00
Bill Yi
88409f1af9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I838570051ce2aab9c2b98fb2bf738a06b7687893
 2021-01-02 22:27:59 +00:00
Bill Yi
783c18d8a6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibc84cbad5cb80898de5f771c8e1defd43122d694
 2021-01-02 21:59:25 +00:00
TreeHugger Robot
c045ccdc5a Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-01-02 18:05:17 +00:00
Treehugger Robot
30364048ce Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-01-02 03:14:44 +00:00
Bill Yi
502f111677 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie47dac2298ca18d01ea7d1319eab3a9dd221d191
 2021-01-01 18:34:16 -08:00
Bill Yi
dee457eea5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I32232511655da9fe89308d73e084412957f3d03d
 2021-01-01 17:46:51 -08:00
Bill Yi
3e0563138f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I31a8c787f06f10c5c985268ea2652dff6d3161ff
 2021-01-01 22:26:03 +00:00
Bill Yi
028d6f33b5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib1f949c9281dc4a209ff3ccd84f74423fd92ebb6
 2021-01-01 21:57:18 +00:00
Bill Yi
0c1be5d54b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I85cdb72acedfc12b1536df9210643999e043a096
 2020-12-22 08:48:39 -08:00
Treehugger Robot
3d0be7ca05 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-12-20 18:43:29 +00:00
Bill Yi
cb8819b42f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If6d96e565647fb0bbbc643834aebb719fbc2d843
 2020-12-20 12:41:07 +00:00
Bill Yi
c741c74967 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia7493562157c18c8a1ad4295d310a33400d90b20
 2020-12-20 12:14:03 +00:00
Bill Yi
86fcddb29b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2a52c07fe48323256cc95a05226098db1e6ae2fa
 2020-12-19 06:15:53 +00:00
TreeHugger Robot
bd246b61d2 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-12-17 15:12:31 +00:00
Bill Yi
b4654c5ed2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If6a00d0339bbc6474ec6cdd0c730f0b864b2b701
 2020-12-17 05:00:45 +00:00
Bill Yi
f6330f35c6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I36766724094cdd2b8525fac2177ff61545305a46
 2020-12-17 04:32:39 +00:00
Wesley.CW Wang
421cbc63ad Update Battery Defender tips title am: ee1d07d59b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13223683

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib651d0c708471af6cac52255b25159730269843e
 2020-12-15 18:48:30 +00:00
Wesley.CW Wang
ee1d07d59b Update Battery Defender tips title 
Bug: 175662315
Test: make SettingsRoboTests
Change-Id: I13ba773ea4402c5ae54260a8b8cbea4620eed535
 2020-12-15 10:21:06 +00:00
Bill Yi
a26056a6ef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ica5c216524bf124fc447dd64e2b7ca36c244fb81
 2020-12-10 12:10:19 -08:00