Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,000 Commits 1 Branch 0 Tags
17c93edb3c02f271fb433e2fa4525a5000007a21
Commit Graph

14471 Commits

Author SHA1 Message Date
Jyun LuoLai
283e24a028 Merge "Update Bluetooth related string" into pi-dev am: 198a6495ad 
am: 1c502210e3

Change-Id: Id6cdd7982d73835baec447076a49e184979e099d
 2018-03-27 05:03:15 +00:00
Jyun LuoLai
1c502210e3 Merge "Update Bluetooth related string" into pi-dev 
am: 198a6495ad

Change-Id: Icb0cdc09c6c0ccb1d359ff4b5e0887cab9f635d9
 2018-03-27 04:28:56 +00:00
TreeHugger Robot
198a6495ad Merge "Update Bluetooth related string" into pi-dev 2018-03-27 03:53:27 +00:00
Jyun LuoLai
b71cb79a07 Update Bluetooth related string 
Bug: 73960246
Test: Manual test
Change-Id: Ied2a45648e52a78abe3dc84647694dd68874ba5f
 2018-03-27 03:09:32 +00:00
Felka Chang
39cfed5707 Merge "To update from "Data saver" to "Data Saver"" into pi-dev am: 135a7e9753 
am: 5021c0c22d

Change-Id: Ie32dec259c8053d7745e052b81d69f686fe28606
 2018-03-27 02:29:49 +00:00
Felka Chang
5021c0c22d Merge "To update from "Data saver" to "Data Saver"" into pi-dev 
am: 135a7e9753

Change-Id: I95871ed90bfdc71a77569cb2f9fac9682d47d6ca
 2018-03-27 02:13:31 +00:00
Felka Chang
135a7e9753 Merge "To update from "Data saver" to "Data Saver"" into pi-dev 2018-03-27 02:08:21 +00:00
Fan Zhang
f17216d29d Merge "Add more string for device muted condition" into pi-dev am: 2bc477959c 
am: 3ca50d70ac

Change-Id: I884441946a5b64ea66e7cb9e0b8bf9463b80916a
 2018-03-27 01:10:50 +00:00
Fan Zhang
3ca50d70ac Merge "Add more string for device muted condition" into pi-dev 
am: 2bc477959c

Change-Id: I0d58d639444733484818a557f2c35e4955c75beb
 2018-03-27 00:52:06 +00:00
Fan Zhang
2bc477959c Merge "Add more string for device muted condition" into pi-dev 2018-03-26 23:55:07 +00:00
Fan Zhang
5088523c5d Add more string for device muted condition 
Bug: 76022431
Test: build
Change-Id: Ib3801b2ecd18d094e4431aeb89d711a6c9e62689
 2018-03-26 15:52:22 -07:00
Julia Reynolds
1de83b7c65 Update recently sent preferences am: 5c83f14d7e 
am: 6a942f930b

Change-Id: I4088f66e3c798a30043ccb6e48685f3fa5f7700d
 2018-03-26 17:50:47 +00:00
Julia Reynolds
6a942f930b Update recently sent preferences 
am: 5c83f14d7e

Change-Id: I71d6da7beba2beecad671e296c76a127815fe241
 2018-03-26 17:41:20 +00:00
Julia Reynolds
5c83f14d7e Update recently sent preferences 
Test: make -j RunSettingsRoboTests
Bug: 74318867
Fixes: 73004227
Change-Id: Icecf1d4f0e3dd38c96919874a7f614ed93a001ab
 2018-03-26 11:23:14 -04:00
felkachang
ef1cce6cc0 To update from "Data saver" to "Data Saver" 
To change data_saver_title res string from "Data saver" to "Data Saver".
There are 2 places to change and most of them are belong to en locale
charactors.
  res/values/strings.xml
    To change XML To "Help URL, Data saver" to "Help URL, Data Saver"
    because there is already one XML comment "Data Saver mode is on".
    To change data_saver_title to be "Data Saver" because
    condition_bg_data_title use "Data Saver".

Bug: 75983079
Test: make -j SettingsRoboTests RunSettingsRoboTests
Change-Id: I4ef88c962d6388c38841d47e4dc9674e8a4bb793
 2018-03-26 10:22:44 +08:00
Jeff Sharkey
eebc7ad53b Merge "Add UX string tweaks before string freeze." into pi-dev am: d6e81ab51b 
am: 029834a93e

Change-Id: I3c1fe048e4ba9a9098e1c9dfdd3831dcf28c10eb
 2018-03-25 09:06:30 +00:00
Jeff Sharkey
029834a93e Merge "Add UX string tweaks before string freeze." into pi-dev 
am: d6e81ab51b

Change-Id: Id413301fb3794dbe6055ba76efbfd6099dfbde8d
 2018-03-25 08:59:57 +00:00
Jeff Sharkey
d6e81ab51b Merge "Add UX string tweaks before string freeze." into pi-dev 2018-03-25 08:49:58 +00:00
Matthew Fritze
206691d079 Merge "Return back-up slices for unavailable settings" into pi-dev am: 362ba01789 
am: 2cc4516030

Change-Id: Iaf5c385ebae91340294b027ee6037bb0589fa607
 2018-03-24 07:59:35 +00:00
Maurice Lam
2f4745d402 Merge "Separate skip and clear button in pattern screen" into pi-dev am: 59b25d0043 
am: f95ec59cbf

Change-Id: Ia8aeb392ce080533c503d3cf4e9b6e9370425e87
 2018-03-24 07:58:42 +00:00
Doris Ling
468bbfaa7c Merge "Add toggle title for Data Saver" into pi-dev am: c812ec6c89 
am: 4d3390d619

Change-Id: I58b7c65faa67e70a261b5ceebfd787d3159c9cbd
 2018-03-24 07:57:22 +00:00
Fan Zhang
60d7e5fb74 Merge ""My Phone" -> "About Phone"" into pi-dev am: 6ab6ed4e7a 
am: bb40b8e157

Change-Id: I3d8c617eec7fc1cf739094d834eede3af785e42a
 2018-03-24 07:55:43 +00:00
Fan Zhang
d157f7c846 Merge "Add preference controller to launch app-time-spent UI." into pi-dev am: 30da391fa0 
am: 490eaa1c8c

Change-Id: Ic19a6b808359f45a8c51d06de04d635d1ea10ceb
 2018-03-24 07:54:54 +00:00
Beverly
397e45bf29 Merge "Add string for app info summary" into pi-dev am: 2e32d30298 
am: 714c5fad50

Change-Id: If7cd1cd90e7cb7ec50e5b4bbf627e0624b011b5c
 2018-03-24 07:50:56 +00:00
Doris Ling
a93b5fe982 Merge "Update title text for finterprint suggestion." into pi-dev am: 7bf63eb62a 
am: c69a2a1b6d

Change-Id: I0ae5e6ec09c21914f384d9cf66c23538b3a17777
 2018-03-24 07:47:39 +00:00
Stanley Tng
19f50512ac Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev am: 53332b6dcf 
am: 36f2f35b8c

Change-Id: I8ef143a25ed8cb9d90dfd961f97b0e6ebcdd6c06
 2018-03-24 07:35:48 +00:00
Matthew Fritze
2cc4516030 Merge "Return back-up slices for unavailable settings" into pi-dev 
am: 362ba01789

Change-Id: Ic4dbd881bbe0bc5044b148a4c57736a1a0dc9fac
 2018-03-24 07:17:35 +00:00
TreeHugger Robot
362ba01789 Merge "Return back-up slices for unavailable settings" into pi-dev 2018-03-24 07:04:47 +00:00
Maurice Lam
f95ec59cbf Merge "Separate skip and clear button in pattern screen" into pi-dev 
am: 59b25d0043

Change-Id: Ibd042c0e3686e899e22a144295829309bc623fa4
 2018-03-24 05:55:25 +00:00
TreeHugger Robot
59b25d0043 Merge "Separate skip and clear button in pattern screen" into pi-dev 2018-03-24 05:46:35 +00:00
Doris Ling
4d3390d619 Merge "Add toggle title for Data Saver" into pi-dev 
am: c812ec6c89

Change-Id: Idc9711ebf92a19337e79a01665c8a46330634fda
 2018-03-24 05:36:14 +00:00
TreeHugger Robot
c812ec6c89 Merge "Add toggle title for Data Saver" into pi-dev 2018-03-24 05:30:28 +00:00
Fan Zhang
bb40b8e157 Merge ""My Phone" -> "About Phone"" into pi-dev 
am: 6ab6ed4e7a

Change-Id: I892a6697735121389b4f8797bfadfde4f5b93602
 2018-03-24 05:24:32 +00:00
Fan Zhang
490eaa1c8c Merge "Add preference controller to launch app-time-spent UI." into pi-dev 
am: 30da391fa0

Change-Id: Id6ac2c1980a2fb9ab995168a204295b08cf8e2d8
 2018-03-24 05:23:53 +00:00
Sean Callanan
ee8a899d89 Merge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev 
am: 8d8ee565b1

Change-Id: I147f0648d976094b291b49c2649d8529930436be
 2018-03-24 05:23:17 +00:00
Beverly
714c5fad50 Merge "Add string for app info summary" into pi-dev 
am: 2e32d30298

Change-Id: I96ddc68b7262503a71dc4faf56aef30021e63c87
 2018-03-24 05:22:40 +00:00
Fan Zhang
6ab6ed4e7a Merge ""My Phone" -> "About Phone"" into pi-dev 2018-03-24 05:16:01 +00:00
Doris Ling
c69a2a1b6d Merge "Update title text for finterprint suggestion." into pi-dev 
am: 7bf63eb62a

Change-Id: I566d7bfbcef79ad3231b74dbfb72976459fd5563
 2018-03-24 05:15:50 +00:00
TreeHugger Robot
30da391fa0 Merge "Add preference controller to launch app-time-spent UI." into pi-dev 2018-03-24 05:14:32 +00:00
TreeHugger Robot
8d8ee565b1 Merge "[Settings] Add strings for Natural and Automatic color modes" into pi-dev 2018-03-24 05:14:29 +00:00
TreeHugger Robot
2e32d30298 Merge "Add string for app info summary" into pi-dev 2018-03-24 05:14:24 +00:00
TreeHugger Robot
7bf63eb62a Merge "Update title text for finterprint suggestion." into pi-dev 2018-03-24 04:58:29 +00:00
Stanley Tng
36f2f35b8c Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev 
am: 53332b6dcf

Change-Id: Id736294962a1aa79e1e93647abca38bc4a9c575a
 2018-03-24 04:23:02 +00:00
Stanley Tng
53332b6dcf Merge "Add new strings for Hearing Aid profile in Accessibility app" into pi-dev 2018-03-24 04:09:04 +00:00
Daniel Nishi
1304bf0885 Merge "Add string to warn users about device name." into pi-dev am: 0d221f7767 
am: 8537eeb1e9

Change-Id: I8e770ba62dbcb9d95c1246b23c8134b32ba36911
 2018-03-24 04:08:07 +00:00
Tony Mak
dfc32a3f3a Merge "Updates the policy transparency dialog string" into pi-dev am: 95e22fa7bd 
am: 6f924f55b7

Change-Id: I088eea88abdbde838ebe364289cda1f50187a0e5
 2018-03-24 03:14:55 +00:00
Victor Chang
0b9c868670 Merge "New strings for time zone picker" into pi-dev am: 6c737f9790 
am: 04766dba13

Change-Id: Ia485d022a01ada5286e35b5935ee844aa3219e7f
 2018-03-24 03:10:48 +00:00
Salvador Martinez
766b2f644b Merge "Add new strings for auto-wifi" into pi-dev am: 553c2778af 
am: 8faae1eebb

Change-Id: Ie2733871f24a873ebcad12f752fd41f6fa2032fa
 2018-03-24 03:04:41 +00:00
Salvador Martinez
18d9810216 Merge "Add extra strings for hidden network option" into pi-dev am: 8bbb4082bb 
am: d53258e023

Change-Id: Ic780a8fbe4bf63e4cd1e5252dfc79e09057c9362
 2018-03-24 02:57:35 +00:00
Daniel Nishi
8537eeb1e9 Merge "Add string to warn users about device name." into pi-dev 
am: 0d221f7767

Change-Id: I4863d112cedaecf0f14c3355c0b350ba03eb297e
 2018-03-24 02:23:24 +00:00