Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,324 Commits 1 Branch 0 Tags
f8aaaeedbf76d67dbe36f35d5a310fda66ebd64d
Commit Graph

1867 Commits

Author SHA1 Message Date
Fabrice Di Meglio
75cefd093c am e384b253: am 263233b2: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev 
* commit 'e384b2534b5230d61cfb88e136528002a187533b':
  Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility
 2014-09-11 17:22:19 +00:00
Fabrice Di Meglio
877fb7fb42 Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev 2014-09-10 20:14:15 +00:00
Fabrice Di Meglio
ade5761557 Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility 
- add missing string

Change-Id: I9c6a50353075b05d0f80d112c999b2579cdb6676
 2014-09-10 13:12:25 -07:00
Elliott Hughes
fa13725d12 am 8a71e343: am 15a2e89a: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev 
* commit '8a71e3436f4230551c0839cb7eeba44478d04dc2':
  Start cleaning up percentage formatting in Settings.
 2014-09-09 00:00:01 +00:00
Elliott Hughes
5c0d0729b1 Merge "Start cleaning up percentage formatting in Settings." into lmp-dev 2014-09-08 23:26:20 +00:00
PauloftheWest
995d4377fe am d5dc8b35: am 8c5140c0: am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 
* commit 'd5dc8b3567d22fa2c10282ae95bf2653087299b9':
  Material theme updates for Bluetooth Device picker.
 2014-09-04 18:25:05 +00:00
PauloftheWest
0e73c521bd Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 2014-09-04 17:50:00 +00:00
Fabrice Di Meglio
bfd6892818 am f52f4da3: am b876576a: am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 
* commit 'f52f4da309a78c80b598b8e53d28cacc6dc9f334':
  Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings
 2014-09-04 17:33:18 +00:00
PauloftheWest
e32220eedc Material theme updates for Bluetooth Device picker. 
Bug: 17303554
Change-Id: I6eba8654ffb95ff6a9e31c43f8e2ba93df79280d
 2014-09-04 10:16:09 -07:00
Fabrice Di Meglio
5a8a75d98b Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 2014-09-04 17:01:16 +00:00
Fabrice Di Meglio
add95b1502 Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings 
- add the requested infos

Change-Id: Ib2d07f79d8c2e2c85032d7ec595055254437ba19
 2014-09-03 18:31:47 -07:00
Elliott Hughes
7253df35a0 Start cleaning up percentage formatting in Settings. 
This fixes some of the percentage formatting issues, but there are
still about ten strings with hard-coded %%s in them.

Bug: 15476051
Change-Id: I668b6b16e598425f6006f6de0005c980f613f5b2
 2014-09-03 17:04:01 -07:00
Jason Monk
07cdf23306 am 797f3c48: am 8069392f: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev 
* commit '797f3c48532fdec5b692342a5554330755ba4778':
  Bring back auto-rotate to settings
 2014-09-03 05:02:54 +00:00
Jason Monk
d3232da75a Bring back auto-rotate to settings 
Add a dropdown preference to the display settings screen that
controls whether auto-rotate is on.

Bug: 16636008
Change-Id: I71099a23793aa82b514bd0eebae183695415a92c
 2014-09-02 15:46:08 -04:00
Andres Morales
bfa0f9d527 am 6afc60d1: am 7228243b: am ab61b0df: Throw up ProgressDialog when erasing PST partition 
* commit '6afc60d1003b4fa6ba3f01f6e95ec2434e4de6ea':
  Throw up ProgressDialog when erasing PST partition
 2014-09-01 11:25:32 +00:00
Andres Morales
ab61b0df4a Throw up ProgressDialog when erasing PST partition 
This needs to be done here, but we should let the user know
we're doing work.

Bug: 17185720
Change-Id: I0d71ae38145e0649a430a8231b7e3f250c003ee8
 2014-08-29 12:46:18 -07:00
Selim Gurun
7c2bb73f03 am 8cb90f40: am a8028968: am d578fc00: Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev 
* commit '8cb90f4015e13c3e4b916773f23a0d8455205383':
  Use GoogleSetting to override DRP setting if available
 2014-08-28 23:18:55 +00:00
Selim Gurun
d578fc00b5 Merge "Use GoogleSetting to override DRP setting if available" into lmp-dev 2014-08-28 22:11:46 +00:00
Adam Lesinski
77ff1c62be am c26722d0: am 54bff843: am ce0083b0: Merge "Update UI for UsageStatsSettings" into lmp-dev 
* commit 'c26722d036b05d4a0dbfcc6fe87cbd8ce1b15b03':
  Update UI for UsageStatsSettings
 2014-08-28 19:39:05 +00:00
Adam Lesinski
ce0083b05c Merge "Update UI for UsageStatsSettings" into lmp-dev 2014-08-28 19:05:46 +00:00
Christoph Studer
9e110f2672 am 135617f7: am cd507cdb: am 755c97d6: Merge "Settings: Increase no&sounds char limit to 30" into lmp-dev 
* commit '135617f7122a3b2ef94811ac982b94990116e2bb':
  Settings: Increase no&sounds char limit to 30
 2014-08-28 18:53:07 +00:00
Christoph Studer
cf2e4d58db Settings: Increase no&sounds char limit to 30 
Bug: 17196576
Change-Id: I9baffcf19258e1d106b69a8738dbd387ec61def7
 2014-08-28 15:01:19 +02:00
Adam Lesinski
1813c6297f Update UI for UsageStatsSettings 
Bug: 16461070
Change-Id: I616421d5ff8124892a676b8f5302b2341773d6eb
 2014-08-27 19:00:30 -07:00
PauloftheWest
da75eae851 am 7926eb04: am caccf27e: am d0ec53e3: Merge "Applied Material Spec to Bluetooth pairing dialog." into lmp-dev 
* commit '7926eb04d94077d25d08697ea0c60e72eee506ac':
  Applied Material Spec to Bluetooth pairing dialog.
 2014-08-27 21:50:03 +00:00
PauloftheWest
e49c30e533 Applied Material Spec to Bluetooth pairing dialog. 
Bug: 17018290
Change-Id: I621164245e6ad8213a689ea4919c619a9ee4f189
 2014-08-27 13:17:51 -07:00
Dianne Hackborn
6a6d1d7ee5 am 6d98f8e1: am b1391d84: am c436b159: Merge "Tweak voice settings strings." into lmp-dev 
* commit '6d98f8e1cbe23348c43a981d37d6b75fcfe99867':
  Tweak voice settings strings.
 2014-08-25 08:25:08 +00:00
Amith Yamasani
b5ba4afdca am cb7b83de: am 77287101: am 8fe71068: Merge "Don\'t index the ChooseLockGeneric screen" into lmp-dev 
* commit 'cb7b83de42b13b55030f5d0207f42fcc9e346968':
  Don't index the ChooseLockGeneric screen
 2014-08-25 08:24:10 +00:00
Dianne Hackborn
c436b15953 Merge "Tweak voice settings strings." into lmp-dev 2014-08-24 18:53:17 +00:00
Dianne Hackborn
7912a76cd2 Tweak voice settings strings. 
Change-Id: I4cb6badaf2d013d43d87bc8ecdc0763c4e5d6b50
 2014-08-23 14:11:12 -07:00
Selim Gurun
b56bab1fd4 Use GoogleSetting to override DRP setting if available 
Bug: 12492817

The developer setting will be deprecated and eventually will be
removed after the setting is moved to its new location.
This is the prep work for it.

Change-Id: If0b019b33a544b7d2e659161685fa33ca052f612
 2014-08-23 08:32:09 -07:00
Amith Yamasani
8fe710682a Merge "Don't index the ChooseLockGeneric screen" into lmp-dev 2014-08-23 01:07:03 +00:00
Jim Miller
c35e4fafa3 am 0c5fdd10: am 86e9f7cd: am 1351b0fb: Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev 
* commit '0c5fdd10dedf7c3671d19addcea270ed945b92d1':
  Show trust agent entries as disabled rather than removing them.
 2014-08-22 22:54:40 +00:00
Amith Yamasani
644907a86f Don't index the ChooseLockGeneric screen 
This avoids indexing face unlock, which may not always exist or might
be disabled by policy.

Instead, add some of the relevant keywords up one level in Security
settings.

Bug: 17185326
Change-Id: I4fbae1c0384a97383707104a6fe283075edbf341
 2014-08-22 15:38:16 -07:00
Jim Miller
1351b0fbcd Merge "Show trust agent entries as disabled rather than removing them." into lmp-dev 2014-08-22 22:25:16 +00:00
Jessica Hummel
da277ed6e3 am 6c86560c: am 1da99d2b: am 2e9e044e: Final tweaks to work profile strings 
* commit '6c86560cad3fc0ab1d198ba3a429f9cb79b15f99':
  Final tweaks to work profile strings
 2014-08-22 15:01:59 +00:00
Jessica Hummel
2e9e044ed2 Final tweaks to work profile strings 
Change-Id: Icd8f3ac2e8e3fb7f0368cdf40bcd42b4f275258b
bug:15744182
 2014-08-22 14:06:30 +00:00
Alexandra Gherghina
4810f9b49d am 61d33eb7: am 70a7c59d: am 9239d6d0: Merge "Update strings for removing work profile" into lmp-dev 
* commit '61d33eb7b7c4a38e4d53e2de5425f1594715f3fd':
  Update strings for removing work profile
 2014-08-22 13:21:01 +00:00
Alexandra Gherghina
9239d6d0a2 Merge "Update strings for removing work profile" into lmp-dev 2014-08-22 12:53:29 +00:00
Alexandra Gherghina
4c96267acd Update strings for removing work profile 
Bug: 17139301
Change-Id: I524946ab7856b10ed68a2e90c7f488d20731b169
 2014-08-22 11:17:31 +01:00
Jim Miller
9d25005e7a Show trust agent entries as disabled rather than removing them. 
Fixes bug 17108810

Change-Id: I646f5c299cd680d5c3a4978610f3852eba4b116b
 2014-08-21 19:46:26 -07:00
Kenny Guy
2c7addd8ab am 38afb092: am 100d45ec: am 66b0d9e8: Merge "Disable non-permitted accessibility services and IMEs" into lmp-dev 
* commit '38afb092aecc5585d75ef3d5e54129d3600d1ae6':
  Disable non-permitted accessibility services and IMEs
 2014-08-21 18:15:56 +00:00
Kenny Guy
333f2bc71a Disable non-permitted accessibility services and IMEs 
Bug: 14469005
Change-Id: I4986f035318854c27ecb92bbe2f0c977d53b6361
 2014-08-21 17:15:49 +01:00
Jessica Hummel
9dff428485 am 1cba7345: am a477e891: am ff2da2cd: Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev 
* commit '1cba7345801050c90652beed852d7209b7a948b9':
  Make string for work profile consistent with provisioning and framework strings.
 2014-08-21 13:39:29 +00:00
Jessica Hummel
ff2da2cdb3 Merge "Make string for work profile consistent with provisioning and framework strings." into lmp-dev 2014-08-21 11:28:24 +00:00
Tadashi G. Takaoka
d9035ef969 am 389bea96: am d925c995: am fe3794a9: Remove "Choose Keyboards" settings 
* commit '389bea96d92ee162d5bb286884f9e536baca05c2':
  Remove "Choose Keyboards" settings
 2014-08-21 05:16:19 +00:00
Amith Yamasani
56635ebd5f am 05ff676f: am 6879169f: am 23d8742d: Merge "Update string for profile owner addition warning" into lmp-dev 
* commit '05ff676f5cf426bd054e624354b7e91418a7a5ef':
  Update string for profile owner addition warning
 2014-08-21 04:10:37 +00:00
Tadashi G. Takaoka
fe3794a937 Remove "Choose Keyboards" settings 
Bug: 17109233
Change-Id: Ia3860b12238d9d2233dc270e37a055a9a411b037
 2014-08-21 11:41:57 +09:00
Amith Yamasani
2e4489d6c3 Update string for profile owner addition warning 
Bug: 16207721
Change-Id: I561e0fc992f19339ab794dd7dffb9d650da141a0
 2014-08-20 13:43:13 -07:00
Jon Miranda
c895872545 am af1d4c7c: am b96f55f0: am 735219be: Merge "Added a developer option to save attribute data." into lmp-dev 
* commit 'af1d4c7c1557a997ba8f1439972665c63cf0e8dc':
  Added a developer option to save attribute data.
 2014-08-20 15:48:34 +00:00
Jessica Hummel
fc8cf67df6 Make string for work profile consistent with provisioning and framework strings. 
Change-Id: Id52937400a2664d25b40649767df5b6723886871
bug:16468412
 2014-08-20 15:45:53 +01:00