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
Alan Viverette
ebaa0f02e7
am f1f7af01: am 05df9029: am e4031966: am 6f6e547e: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
...
* commit 'f1f7af01deb8e5c2bfd102ed4455e2d3d59c8e72':
Fix background colors to point directly to theme attribute
2014-09-24 17:17:06 +00:00
Alan Viverette
f81f72ffed
Fix background colors to point directly to theme attribute
...
BUG: 17520824
Change-Id: I77fcbc2a5535f4916053cf1668cbe2e432b2dc95
2014-09-23 18:14:54 -07: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
Mark Salyzyn
0e77a346bb
am 22955813: am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support
...
* commit '229558137318fdebce6b1bf3f5b30ea96e65a400':
logd: settings: ro.config.low_ram support
2014-09-17 23:46:59 +00:00
Mark Salyzyn
894af268de
logd: settings: ro.config.low_ram support
...
- limit settings to 64K, 256K and 1M if ro.config.low_ram true
- Correctly handle ro.logd.size
Bug: 17526187
Change-Id: I2380b649516b29c2a98f54de18e5a4780b3421ce
2014-09-17 22:26:16 +00: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
PauloftheWest
79c32a04b5
am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
...
* commit 'd1cd913a6e1dc35da4d5e0c1fc4b48a0e382d486':
Alignment updates for Wi-Fi Settings dialog.
2014-09-16 09:07:08 +00: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
Maurice Lam
e1300a2c9b
am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window
...
* commit 'ea8db10ac8fc3aafd7834c401aacf7245b244936':
[WifiSetup] Disable app starting window
2014-09-16 09:07:02 +00:00
PauloftheWest
9b6f42b309
am f1fc7219: am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
...
* commit 'f1fc7219298b5c8dd0bf5c695f3f3942289a05df':
Updated Wi-Fi Settings icons to new filled-in teal format.
2014-09-16 08:30:51 +00:00
PauloftheWest
ec21e62a78
Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
2014-09-16 02:13:29 +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
PauloftheWest
8ad6c3fe55
Alignment updates for Wi-Fi Settings dialog.
...
Bug: 17489021
Change-Id: Id394dbe67625cd33745ccbe0f58921fcc38115ec
2014-09-15 16:49:31 -07: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
0ca0c8ad20
Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
2014-09-15 21:25:13 +00:00
Maurice Lam
795511ec9c
[WifiSetup] Disable app starting window
...
Disable the app starting window when start WifiSetupActivity so that
there will not be a blank black screen the first time this activity
is started.
Bug: 17457465
Change-Id: I4fa019a603a088d458fa9bcf126364fbb49b1b1f
2014-09-15 11:40:34 -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
PauloftheWest
13fbd848d4
Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
2014-09-15 14:35:46 +00:00
Alexandra Gherghina
b5c7c79a0a
am 02d41b91: am 0bf3dc02: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
...
* commit '02d41b916c24eb458b7ce695d0663cbe6c49a4b8':
Switch to using system-wide default user icons
2014-09-12 19:29:07 +00:00
Alexandra Gherghina
bc6e78f9da
Switch to using system-wide default user icons
...
User icons were either User Settings specific, or missing. This makes it
consistent with the ones in the new helper class.
Bug: 17311038
Change-Id: I20cc1deba989cf7a397c5a8dba41bd91bd62472b
2014-09-12 17:00:40 +01:00
PauloftheWest
7e6e7acbf1
Updated Wi-Fi Settings icons to new filled-in teal format.
...
+ Added a filled-in teal Wi-Fi unlocked and locked icons.
+ Added a teal theme to Settings.
+ Updated Wi-Fi Settings and Setup Wizard to use the new teal format.
+ Updated the Settings icon (used in the Settings dashboard and in
search) to the new format.
Bug: 17331199
Change-Id: I0565ef6f2fa1be035c1bd150ea853cb976dc504c
2014-09-12 07:18:10 -07:00
John Spurlock
b9b559cfa6
am a3eee6fb: am 4fba99a9: am 31915522: Settings: Remove fixed dropdown width from "From" pref.
...
* commit 'a3eee6fb2d94561f1d2b28be1b6f1255d95fbb29':
Settings: Remove fixed dropdown width from "From" pref.
2014-09-11 17:25:19 +00: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
John Spurlock
c46156277a
am 77056e3f: am 740eeb97: am cddb2954: Settings: Make downtime days scrollable.
...
* commit '77056e3f04dcacea63a7da0cbb3483e91927e3d1':
Settings: Make downtime days scrollable.
2014-09-11 14:14:12 +00:00
John Spurlock
31915522b7
Settings: Remove fixed dropdown width from "From" pref.
...
Bug:17457729
Change-Id: I99d294f43211765e410af53e87bb96b06715c0e3
2014-09-10 17:49:28 -04: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
John Spurlock
cddb29544a
Settings: Make downtime days scrollable.
...
Bug:17428288
Change-Id: I389aece9d79d002426a0bcb03d4a523293012892
2014-09-10 10:04:44 -04:00
Elliott Hughes
2f696300b9
am ebd410e5: am 38a8fa2e: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
...
* commit 'ebd410e529c8dc249ce80bab86e178fe4de8fe27':
Always use the LocalePicker's preferred locale names.
2014-09-09 22:21:49 +00:00
Elliott Hughes
81395c8f3d
Always use the LocalePicker's preferred locale names.
...
Without this change we have the odd situation where LocalePicker goes out of
its way to avoid saying certain things but then -- as long as there's more than
one locale for a given language -- Settings would happily report the name we'd
been avoiding. (Either because it's too specific or because it's too sensitive.)
Also remove the unused bit-rotted duplicate of the blacklist; even if we needed
to access that list directly, we should use LocalePicker's copy.
Bug: 17150708
Change-Id: I9bfa0bf9a82bebd29ba45f4cbeaabb4e78570779
2014-09-09 14:33:11 -07:00