Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,361 Commits 1 Branch 0 Tags
e3cb991663d688c5efab4a2a4987492689c5b607
Commit Graph

6794 Commits

Author SHA1 Message Date
Mike Lockwood
3f6ef34b35 Add developer setting for changing the current USB configuration 
This can be useful for testing the audio source kernel driver,
reverse tethering over RNDIS, etc.

Change-Id: I7392f95545cf5ae8a36b4b7b0d37f003df7e70b2
 2014-10-06 10:17:13 -07:00
Elliott Hughes
e6cd6aef23 am 22ea4c41: resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp 
* commit '22ea4c41ae79b52dac3d0c3789e6587bc4d6a43a':
  Fix percentage formatting throughout Settings.
 2014-10-04 16:43:09 +00:00
PauloftheWest
ff14c67143 am 1713fe25: am 0834ff0b: am 6ceaa82b: am 4046cf9c: Merge "[DS] DSDS support for Settings" into lmp-sprout-dev 
* commit '1713fe2524361a2e10b877925bf93053a6cd173d':
  [DS] DSDS support for Settings
 2014-10-04 16:05:46 +00:00
Elliott Hughes
50c377f09f Merge "Fix percentage formatting throughout Settings." into lmp-mr1-dev 2014-10-04 00:44:10 +00:00
Svetoslav
7b2a6a47c7 am 4ab0396c: am 94c1f70c: am 5c690775: am 35314f27: am 5cdd3f4f: Update accessibility plus secure lock warning messages. 
* commit '4ab0396c7fbb25033f7c81dc297bafb96778eb3a':
  Update accessibility plus secure lock warning messages.
 2014-10-04 00:01:27 +00:00
Elliott Hughes
83f013cfd4 Fix percentage formatting throughout Settings. 
Bug: 15476051
Change-Id: Ic64e7c36d0e2732d3e0e79fec2b79de42decf77d
 2014-10-03 15:52:20 -07:00
PauloftheWest
4046cf9cb4 Merge "[DS] DSDS support for Settings" into lmp-sprout-dev 2014-10-03 22:45:26 +00:00
PauloftheWest
50e6ecacf9 [DS] DSDS support for Settings 
+ Rebase and modify as APIs rename.
+ Fix bugs on set sub's name as title.
+ Enabled Sim Settings.

Change-Id: Ic731c7882be95b86b6b8dcdd3f208a6125681f3e
 2014-10-03 15:22:59 -07:00
Svetoslav
5cdd3f4f6f Update accessibility plus secure lock warning messages. 
bug:17671790

Change-Id: I694586452963a8f0e4c86b5c9c807ca9bb2ec15d
 2014-10-03 13:27:13 -07:00
PauloftheWest
3db132a58f am ebe0125f: am d960f94f: am de8ef74e: am 32ce9484: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec. 
* commit 'ebe0125fa87588b96df510c7c6ba91ad011d8fc2':
  Updated Wi-Fi hotspot dialog to the Material Spec.
 2014-10-03 14:04:49 +00:00
PauloftheWest
6e26427e52 Updated Wi-Fi hotspot dialog to the Material Spec. 
+ If there is scrolling then force the scrollbars to always appear.
+ Align contents of the dialog with the title.
+ Change "Network SSID" to "Network name".
+ Added wifi_* styles to other style xml files so that Wi-Fi hotspot dialogs are visible on tablets.
+ Move layout_width/height from res/layout/{wifi_dialog.xml, wifi_dialog_row.xml} from style into the xml file.

Bug: 17684359
Change-Id: I42fb69132d6ba0fb8d9853de6f5524f29e6b70b6
 2014-10-02 14:25:03 -07:00
Hui Shu
19a1a8c3f9 am 6abc2c25: am e9a39e28: am 9184ed5c: am c1c9888d: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 
* commit '6abc2c25b568d352de948519e76cbd3a38b77efb':
  Remove WebView DRP Setting from Developer Settings
 2014-10-02 12:47:38 +00:00
Svetoslav
fa9699c13d am 4b2fc1ad: am 7358b7d5: am e78840ff: am 42eff3b7: am 52448442: Use default encryption password if an accessibility service is enabled. 
* commit '4b2fc1adad9e27b9a78732a87678297834f82e9c':
  Use default encryption password if an accessibility service is enabled.
 2014-10-02 12:47:33 +00:00
Hui Shu
905f9e2f90 Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 2014-10-01 18:28:52 +00:00
Hui Shu
90886b8284 Remove WebView DRP Setting from Developer Settings 
BUG: 17730990
Change-Id: I776844ee617916037b861ec7385365bb5873d4a0
 2014-09-30 16:53:36 -07:00
Svetoslav
5244844268 Use default encryption password if an accessibility service is enabled. 
If accessibility is on and the user selectes a secure lock we use weaker
encryption to enable running accessibility layer at the time the user
authenticates. This change adds a warning message to the enable accessibility
service dialog if there is a secure lock and also adds a warning as a
summary for the secure lock in the lock chooser activity. Both warning
mention the weaker encryption to be used.

bug:17671790

Change-Id: Ib5cc9d3a78f751e18362bb9238fd2804c3b600f8
 2014-09-30 23:03:37 +00:00
Vinit Deshpande
d7d604056b Merge "Separate wifi AP added by applications." 2014-09-27 02:01:13 +00:00
Sky Faber
2d657e3629 Separate wifi AP added by applications. 
-Add permission to allow settings to modify all wifi APs
-Add option to show AP owners.

Change-Id: I12943563ef714c4287e13488578f020d136d006d
 2014-09-27 02:00:36 +00:00
John Spurlock
edb8125abf am 2c383942: am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option. 
* commit '2c383942b3fbda90e390cf8975fd3de32a0c007e':
  Settings: Wire up new zen events config option.
 2014-09-23 19:06:42 +00:00
John Spurlock
7e90548836 Settings: Wire up new zen events config option. 
Add a new switch to zen mode settings for the new
events config attribute.

Depends on frameworks/base:
  Iff10df385206ad73c3423ff118c79e94a10918d9

Bug:17580878
Change-Id: Ib6c74a871aa02f9379dce58dd5bca817dcd3929a
 2014-09-22 16:45:06 -04:00
PauloftheWest
13a63ef39b am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation. 
* commit '63f9500e0daae4b9aeda2bf4282bbe5dd8925b8e':
  Increase char limit for translation.
 2014-09-17 18:49:59 +00:00
PauloftheWest
3cc81aeabf Increase char limit for translation. 
Bug: 17128776
Change-Id: Ica6d4f895f0991eb99d8e8e6ec0f16deee1312e5
 2014-09-17 08:30:09 -07:00
Edward Jee
170be5c8c8 am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 
* commit '32c56ed434dbeec9cf2b0db62f43396d5b2a08d5':
  Do not show phonebook access permission dialog if pairing dialog has already been shown.
 2014-09-16 09:07:06 +00:00
PauloftheWest
88f7fa0b9e am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev 
* commit '8dee66d1248af1aa28b32d11b1b3160ab3a79437':
  Removed all references to "Google Wi-Fi Assistant" from Settings.
 2014-09-16 09:07:05 +00:00
Edward Jee
b0954c1d1e Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev 2014-09-16 01:19:07 +00:00
Edward Jee
a539716a94 Do not show phonebook access permission dialog if pairing dialog has already been shown. 
Bug: 16964116, 13886947, 16345619

Change-Id: I9cf2622b49c3812771d57432fed030affaa5ba48
 2014-09-15 14:33:13 -07:00
PauloftheWest
f4b548c0f5 Removed all references to "Google Wi-Fi Assistant" from Settings. 
+ Removed Wi-Fi Assistant message in Wi-Fi Advanced since it was
overridden by the Wi-Fi Assistant.
+ Removed Wi-Fi Assistant message in Wi-Fi Assistant Card.  Instead,
it is programatically created when the scorer is known.
+ "Google" was replaced with a placeholder.

Bug: 17457236
Change-Id: If3aab06c911ecf6ec13cbf00dea2fe9333abc1fc
 2014-09-15 09:31:56 -07:00
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