Adam Lesinski
8d7be7b738
Update Settings to use new UsageStats API
...
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
2014-07-18 14:35:54 -07:00
Jeff Davidson
2622bd7599
am 878ca0ed
: Merge "Link WifiAssistant card with actual settings." into lmp-dev
...
* commit '878ca0edb9598de695750b72c7cd3d1c056d984c':
Link WifiAssistant card with actual settings.
2014-07-18 20:59:42 +00:00
Paul Lawrence
bf05242300
am 312927ab
: Material fixes for tablets
...
* commit '312927abd77b0884eed9aa2ca1de4d0c04b4165f':
Material fixes for tablets
2014-07-18 19:54:06 +00:00
Paul Lawrence
312927abd7
Material fixes for tablets
...
Remove wireframe Android from pattern screen
Remove tablet specific password entry - we don't have one for PIN, and
the password one looks awful.
Bug: 15328359
Change-Id: I3d73a346166641ab72ecf520f9fbe2ee1379fe8a
2014-07-18 19:49:26 +00:00
Maurice Lam
a498083303
am b3f69cd1
: Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev
...
* commit 'b3f69cd10435fdf2d799bafdde4949e70c1f84f1':
[WifiSetup] Mechanism for suspending auto finish
2014-07-18 19:12:41 +00:00
Fabrice Di Meglio
39a2cbb32c
Merge "Fix the way we select and apply Themes" into lmp-dev
2014-07-18 18:24:25 +00:00
Fabrice Di Meglio
84dfc0b5d6
Merge "Fix overdraw and do some layout optimizations" into lmp-dev
2014-07-18 18:24:25 +00:00
PauloftheWest
72e4a85b5a
am 772cf206
: Merge "Minor string fixes for translation" into lmp-dev
...
* commit '772cf2061685e5c7df4b1ebedd1249243cde6f74':
Minor string fixes for translation
2014-07-18 18:12:45 +00:00
Andres Morales
5b452a1163
am 7ab8929c
: On factory reset, wipe the stored account challenges
...
* commit '7ab8929cc6ecbd1ba14c0d6ecb393b31f9a6fcda':
On factory reset, wipe the stored account challenges
2014-07-18 16:46:20 +00:00
Andres Morales
7ab8929cc6
On factory reset, wipe the stored account challenges
...
Each time a user adds an account, a challenge gets
stored to the persistent data block service.
If a user factory resets *from Settings*, this is
considered a "secure wipe" and thus we must wipe
the account challenges as well.
No other factory reset mechanism must be permitted
to wipe this data.
Bug: 14288780
Change-Id: Ibe48ccae2d7b5f8d736717a27b7c4f44bed0fba7
2014-07-18 16:40:37 +00:00
Amith Yamasani
66926227eb
am d0a057cc
: Merge "Improvements to user settings" into lmp-dev
...
* commit 'd0a057ccc89f65f0971a2e7c42758b0fedf7c501':
Improvements to user settings
2014-07-18 15:02:03 +00:00
Alexandra Gherghina
527f0d2066
am 89265a30
: Hide Settings launcher icon for a managed profile
...
* commit '89265a3026faad35107d6ef08f9a59f680819aaf':
Hide Settings launcher icon for a managed profile
2014-07-18 11:22:36 +00:00
Alexandra Gherghina
a41da78efb
am ccdc369e
: Merge "Add account for managed user" into lmp-dev
...
* commit 'ccdc369e4772ed3d97508938861ee00457f8ba3e':
Add account for managed user
2014-07-18 11:22:35 +00:00
Alexandra Gherghina
89265a3026
Hide Settings launcher icon for a managed profile
...
This makes the Settings icon disappear at the next reboot.
Bug: 16369104
Change-Id: Ic0a394413a0f2dc573d340394d2cd24388535856
2014-07-18 11:39:29 +01:00
Fabrice Di Meglio
c63f16ce0d
am c08c67be
: Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev
...
* commit 'c08c67be886082c579983beceeac1d935d8e1c3b':
Fix alignment of ActionBar title and Preferences for tablet UI
2014-07-18 02:43:49 +00:00
Fabrice Di Meglio
3bd0515242
Fix alignment of ActionBar title and Preferences for tablet UI
...
- use the correct start/end padding
See bug: #15439371 Visual add white BG for Settings Detail
Change-Id: I391fb3c75c51349ffbc17295b3aac6f432f91b58
2014-07-17 19:36:14 -07:00
Tadashi G. Takaoka
740de4d39c
am 3ac7802e
: Fix duplicate string resources
...
* commit '3ac7802ee6c8b6d3e1befa7b3c6a970201fc3d24':
Fix duplicate string resources
2014-07-18 02:05:45 +00:00
Tadashi G. Takaoka
3ac7802ee6
Fix duplicate string resources
...
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
2014-07-17 18:07:26 -07:00
Michael Wright
87b69c3030
am b8a90e50
: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
...
* commit 'b8a90e5042c0b112a44d7619fd2928bb92a4a6dc':
Add OP_PROJECT_MEDIA to AppOps
2014-07-17 22:03:58 +00:00
Tadashi G. Takaoka
721e63fc6d
Merge "Remove unnecessary saved persistent preference" into lmp-dev
2014-07-17 21:58:28 +00:00
Tadashi G. Takaoka
3460a2683c
Remove unnecessary saved persistent preference
...
This CL also fixes a bug in
InputMethodAndSubtypeUtil.updateSubtypesPreferenceChecked method that
prevents solving the issue/16115751.
Bug: 16115751
Change-Id: Ib46790172ed539d444fd609a1a97dabb2cb2d2f3
2014-07-18 18:21:44 -07:00
Maurice Lam
b3f69cd104
Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev
2014-07-17 21:58:28 +00:00
Maurice Lam
6a627652cb
[WifiSetup] Mechanism for suspending auto finish
...
We have been using forget() to prevent auto-reconnection when the
user hits back to Wifi setup. This has the side effect of forgetting
networks, which is undesirable especially for password protected APs.
The new mechanism keeps a flag on whether the user has selected a
connection. Only auto-advance if the user has picked a network and
there is a valid WiFi connection.
The new EXTRA_REQUIRE_USER_SELECTION can specify whether a user
selection is required initially. That is, whether to auto finish if
the system connected to a network without user input. The default is
false so WiFi can be skipped if the user started setup wizard with
a valid WiFi connection (e.g. after System Update). Note that a user
selection is always required when the user goes back from the next
screen.
Since the new AP dialog does not have a connect button, the SKIP
button in the navigation bar also changes to NEXT when there is a
valid WiFi connection, so the user can hit NEXT if they decided not
to change the network.
Bug: 15333554
Bug: 15999487
Change-Id: I98e935b8e09e470a0c49c44bc299bb2eced98634
2014-07-17 20:47:04 -07:00
PauloftheWest
772cf20616
Merge "Minor string fixes for translation" into lmp-dev
2014-07-17 21:58:28 +00:00
PauloftheWest
60105a966a
Minor string fixes for translation
...
Bug: 16321903
Bug: 16321706
Bug: 16321066
Bug: 16321704
Change-Id: I65d0d8c89a8d0e7bf2ff2280aab32cd63b9fe369
2014-07-18 11:04:13 -07:00
Fabrice Di Meglio
c08c67be88
Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev
2014-07-17 21:58:28 +00:00
Paul Lawrence
2126ac9fa1
am eb0628bb
: Merge "Final touches to material theme for phones" into lmp-dev
...
* commit 'eb0628bb02e5945acc0b5fe9da7082b279f043d6':
Final touches to material theme for phones
2014-07-17 21:04:25 +00:00
Jeff Davidson
878ca0edb9
Merge "Link WifiAssistant card with actual settings." into lmp-dev
2014-07-17 21:04:20 +00:00
Michael Wright
b8a90e5042
Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
2014-07-17 21:04:20 +00:00
Jeff Davidson
873fa4f2ba
Link WifiAssistant card with actual settings.
...
Only show the card if we haven't already enabled an assistant, and if
there's one available on the device to enable. (For now, we enable the
first one; in the future, we can offer a selection between
assistants).
When the user opts in, we either show the standard system activity or
the custom opt-in activity if the assistant has defined one. In either
case, we only dismiss the card if the child activity indicates that
opt-in was successful.
Bug: 16376277
Change-Id: Ic92c7676c563ab8c8fb695117a053004f15f7d25
2014-07-17 13:48:50 -07:00
Zoltan Szatmary-Ban
ef8a48c85b
am cda76822
: Merge "Update Location Settings for Enterprise" into lmp-dev
...
* commit 'cda76822c49ba80c8e1f2d000bb80058858f4712':
Update Location Settings for Enterprise
2014-07-17 20:16:28 +00:00
Chris Craik
4ce86a69a8
am dd82be9c
: Merge "Access high contrast setting directly" into lmp-dev
...
* commit 'dd82be9c705196d93986f356f464e6ebfed01002':
Access high contrast setting directly
2014-07-17 20:16:28 +00:00
Alexandra Gherghina
46ad810047
am c42d4059
: Remove account for a managed user
...
* commit 'c42d4059b59848bef7bea550522e29d4ef95e18b':
Remove account for a managed user
2014-07-17 20:02:11 +00:00
Alexandra Gherghina
c42d4059b5
Remove account for a managed user
...
Bug: 16056552
Change-Id: Iad24856cab908ed40c32af799ca2c41fe85b6b45
2014-07-17 19:57:43 +00:00
Przemyslaw Szczepaniak
d7bdf17aba
Merge "Make TTS setting transition animation consistent." into lmp-dev
2014-07-17 19:55:10 +00:00
PauloftheWest
995448c76a
am 08ee22cb
: Merge "Removed extraneous string from strings.xml" into lmp-dev
...
* commit '08ee22cb35eadfdacfbb010fc157b3e5febbdd6e':
Removed extraneous string from strings.xml
2014-07-17 19:53:19 +00:00
Alexandra Gherghina
ccdc369e47
Merge "Add account for managed user" into lmp-dev
2014-07-17 19:51:18 +00:00
Alexandra Gherghina
9ce0da9cf1
Add account for managed user
...
Bug: 16056552
Change-Id: I225a1b447d9b4024703b82be8a1fa66359d9e9a1
2014-07-17 21:18:34 +01:00
Alexandra Gherghina
84d719542d
am 7c81c1d1
: Handle managing accounts for a managed profile
...
* commit '7c81c1d1afd57e61eb4b3000a952f95aa9782c64':
Handle managing accounts for a managed profile
2014-07-17 19:49:41 +00:00
Alexandra Gherghina
a4b48a956f
am b8fff27c
: Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev
...
* commit 'b8fff27ce349f5394b75925d9371857a518fa424':
Handle choosing and adding accounts for a managed profile
2014-07-17 19:45:36 +00:00
Zoltan Szatmary-Ban
cda76822c4
Merge "Update Location Settings for Enterprise" into lmp-dev
2014-07-17 19:45:26 +00:00
Zoltan Szatmary-Ban
925560e9a2
Update Location Settings for Enterprise
...
Find packages of the corporate user and show them
with badged icon on the "Recent location requests" list.
Bug: 15467321
Change-Id: Ic52ed3d01a0816288d4818190e82befa5235f28b
2014-07-17 21:11:48 +01:00
Alexandra Gherghina
7c81c1d1af
Handle managing accounts for a managed profile
...
Bug: 15466880
Change-Id: Icf0e06c954269426b500f0e5fbcdf3346c59eb9d
2014-07-17 19:42:46 +00:00
Dianne Hackborn
d0a947692d
am be875db5
: Merge "Battery chart fixes." into lmp-dev
...
* commit 'be875db541d673aa62dd99acebc523a26018616e':
Battery chart fixes.
2014-07-17 19:25:51 +00:00
Amith Yamasani
26523d28ad
am f1d56ebb
: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev
...
* commit 'f1d56ebb111d10779b25f1105c3077cd9fd39890':
Follow split of DISALLOW_TELEPHONY
2014-07-17 19:21:46 +00:00
Fabrice Di Meglio
592a17aa3c
Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev
2014-07-17 19:20:15 +00:00
Baligh Uddin
0f364cdf63
Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
2014-07-17 19:20:15 +00:00
Baligh Uddin
a45d1f8320
Remove deprecated locales - DO NOT MERGE
...
Change-Id: Ibf5ac73ae0784925297180cfec0236687d584fd4
2014-07-19 13:05:24 -07:00
Paul Lawrence
eb0628bb02
Merge "Final touches to material theme for phones" into lmp-dev
2014-07-17 19:13:40 +00:00
Paul Lawrence
aa05738cd2
Final touches to material theme for phones
...
Fix layout
Improve text color/size
Improve edit box look
Hide status bar at top
Bug: 15328359
Change-Id: Ia0ea75c74b352963ccf47db0ff7c9684adc1f2a3
2014-07-17 13:29:23 -07:00