OSDN Git Service
Baligh Uddin [Mon, 21 Jul 2014 12:40:24 +0000 (12:40 +0000)]
am
a6ed6797: (-s ours) am
790b21d4: (-s ours) Import translations. DO NOT MERGE
* commit '
a6ed679762e91598be293f12b10e6a109a03dd42':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 21 Jul 2014 12:32:33 +0000 (12:32 +0000)]
am
790b21d4: (-s ours) Import translations. DO NOT MERGE
* commit '
790b21d44d6a84b16c904fbc478cda0bd2d6450f':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 20 Jul 2014 21:53:03 +0000 (14:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab323e1a057a52bb3408a7173fae984a2d9ff240
Auto-generated-cl: translation import
Baligh Uddin [Sun, 20 Jul 2014 18:08:24 +0000 (18:08 +0000)]
am
633b30ad: am
0f364cdf: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
* commit '
633b30ad3fc0e737eeed80511f8015d7c1d6f365':
Remove deprecated locales - DO NOT MERGE
Tadashi G. Takaoka [Sun, 20 Jul 2014 18:07:56 +0000 (18:07 +0000)]
am
05f5734c: am
a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev
* commit '
05f5734cc52b9eed8880d95d395ae82e2856e0c3':
Fix Settings behavior when disabling current IME
Baligh Uddin [Sun, 20 Jul 2014 18:06:50 +0000 (18:06 +0000)]
am
ff6c12df: (-s ours) am
fdac5db8: (-s ours) Import translations. DO NOT MERGE
* commit '
ff6c12df927a42b33730f770e1e4fd26225f7245':
Import translations. DO NOT MERGE
Tadashi G. Takaoka [Sun, 20 Jul 2014 18:04:19 +0000 (18:04 +0000)]
am
ecf1b79f: am
721e63fc: Merge "Remove unnecessary saved persistent preference" into lmp-dev
* commit '
ecf1b79f1622c526fb4dd86ed4f10fd8237a724e':
Remove unnecessary saved persistent preference
Fabrice Di Meglio [Sun, 20 Jul 2014 18:03:03 +0000 (18:03 +0000)]
am
7ca153f1: am
6f404853: Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev
* commit '
7ca153f11704f8c16195a4e03de81140c1ca0088':
Fix Utils.prepareCustomPreferencesList()
Fabrice Di Meglio [Sun, 20 Jul 2014 18:01:52 +0000 (18:01 +0000)]
am
595b61eb: am
39a2cbb3: Merge "Fix the way we select and apply Themes" into lmp-dev
* commit '
595b61eb3921fead66fc163d33d835e5ba378e7f':
Fix the way we select and apply Themes
Fabrice Di Meglio [Sun, 20 Jul 2014 17:59:33 +0000 (17:59 +0000)]
am
ce0e3008: am
84dfc0b5: Merge "Fix overdraw and do some layout optimizations" into lmp-dev
* commit '
ce0e3008e8e6726e51195f01591666dc7bebf7f3':
Fix overdraw and do some layout optimizations
Baligh Uddin [Sun, 20 Jul 2014 02:39:53 +0000 (02:39 +0000)]
am
0f364cdf: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
* commit '
0f364cdf63c7405ba30d814f30f6fa1fdfd65ee7':
Remove deprecated locales - DO NOT MERGE
Adam Lesinski [Sun, 20 Jul 2014 02:17:44 +0000 (02:17 +0000)]
am
3becea17: am
8d7be7b7: Update Settings to use new UsageStats API
* commit '
3becea17e7f9bc15005e013787392d0a11ea8b73':
Update Settings to use new UsageStats API
Tadashi G. Takaoka [Sun, 20 Jul 2014 01:04:33 +0000 (01:04 +0000)]
am
a2291259: Merge "Fix Settings behavior when disabling current IME" into lmp-dev
* commit '
a229125980f12c9debb1c5a827bb96c5620b5705':
Fix Settings behavior when disabling current IME
Tadashi G. Takaoka [Sun, 20 Jul 2014 01:02:04 +0000 (01:02 +0000)]
Merge "Fix Settings behavior when disabling current IME" into lmp-dev
Tadashi G. Takaoka [Sun, 20 Jul 2014 00:06:20 +0000 (17:06 -0700)]
Fix Settings behavior when disabling current IME
Bug:
16195373
Change-Id: I95d086e152b07e81aece773bc115ac0ac4517392
Baligh Uddin [Sat, 19 Jul 2014 21:51:02 +0000 (21:51 +0000)]
am
fdac5db8: (-s ours) Import translations. DO NOT MERGE
* commit '
fdac5db893285b421c9631dbc62b41a46985aa34':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 18 Jul 2014 01:56:11 +0000 (18:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: If479170defb29f3874fa320e15acd587560cff4c
Auto-generated-cl: translation import
Tadashi G. Takaoka [Sat, 19 Jul 2014 19:13:12 +0000 (19:13 +0000)]
am
721e63fc: Merge "Remove unnecessary saved persistent preference" into lmp-dev
* commit '
721e63fc6da5685a22848c297676dfb5ec959367':
Remove unnecessary saved persistent preference
Fabrice Di Meglio [Sat, 19 Jul 2014 02:23:26 +0000 (02:23 +0000)]
am
6f404853: Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev
* commit '
6f404853087796d46f7a7ef1ad986ec351cc720c':
Fix Utils.prepareCustomPreferencesList()
Fabrice Di Meglio [Sat, 19 Jul 2014 00:59:02 +0000 (00:59 +0000)]
am
39a2cbb3: Merge "Fix the way we select and apply Themes" into lmp-dev
* commit '
39a2cbb32cd93d7eb61a82f395a202238c10e76c':
Fix the way we select and apply Themes
Fabrice Di Meglio [Sat, 19 Jul 2014 00:06:37 +0000 (00:06 +0000)]
am
84dfc0b5: Merge "Fix overdraw and do some layout optimizations" into lmp-dev
* commit '
84dfc0b5d64f9a7224e524794783080fc1b0419e':
Fix overdraw and do some layout optimizations
Adam Lesinski [Fri, 18 Jul 2014 22:29:04 +0000 (22:29 +0000)]
am
8d7be7b7: Update Settings to use new UsageStats API
* commit '
8d7be7b738cce9facdd8832aa845ceb79c19ffc6':
Update Settings to use new UsageStats API
Jeff Davidson [Fri, 18 Jul 2014 22:09:14 +0000 (22:09 +0000)]
am
2622bd75: am
878ca0ed: Merge "Link WifiAssistant card with actual settings." into lmp-dev
* commit '
2622bd759967810b06608682a664fa4478bd8fd2':
Link WifiAssistant card with actual settings.
Adam Lesinski [Fri, 18 Jul 2014 01:30:03 +0000 (18:30 -0700)]
Update Settings to use new UsageStats API
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
Jeff Davidson [Fri, 18 Jul 2014 20:59:42 +0000 (20:59 +0000)]
am
878ca0ed: Merge "Link WifiAssistant card with actual settings." into lmp-dev
* commit '
878ca0edb9598de695750b72c7cd3d1c056d984c':
Link WifiAssistant card with actual settings.
Paul Lawrence [Fri, 18 Jul 2014 19:58:58 +0000 (19:58 +0000)]
am
bf052423: am
312927ab: Material fixes for tablets
* commit '
bf0524230034d0569348ac5c74d3a1f1912f4b42':
Material fixes for tablets
Paul Lawrence [Fri, 18 Jul 2014 19:54:06 +0000 (19:54 +0000)]
am
312927ab: Material fixes for tablets
* commit '
312927abd77b0884eed9aa2ca1de4d0c04b4165f':
Material fixes for tablets
Paul Lawrence [Thu, 17 Jul 2014 16:57:13 +0000 (09:57 -0700)]
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
Maurice Lam [Fri, 18 Jul 2014 19:18:48 +0000 (19:18 +0000)]
am
a4980833: am
b3f69cd1: Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev
* commit '
a498083303e08353574b551e4a236eb5251297b6':
[WifiSetup] Mechanism for suspending auto finish
Maurice Lam [Fri, 18 Jul 2014 19:12:41 +0000 (19:12 +0000)]
am
b3f69cd1: Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev
* commit '
b3f69cd10435fdf2d799bafdde4949e70c1f84f1':
[WifiSetup] Mechanism for suspending auto finish
PauloftheWest [Fri, 18 Jul 2014 18:59:45 +0000 (18:59 +0000)]
am
72e4a85b: am
772cf206: Merge "Minor string fixes for translation" into lmp-dev
* commit '
72e4a85b5a5554a6eab42df92bf8e4294408ba3c':
Minor string fixes for translation
Fabrice Di Meglio [Sat, 19 Jul 2014 00:53:02 +0000 (00:53 +0000)]
Merge "Fix the way we select and apply Themes" into lmp-dev
Fabrice Di Meglio [Sat, 19 Jul 2014 00:44:37 +0000 (17:44 -0700)]
Fix the way we select and apply Themes
- do not override the DialogWhenLarge ones (they have their purpose)
- apply the correct Theme to SubSettings and then as a consequence
to the SwitchBar
Change-Id: I83adabf72da03051f03fbd2121e1e71217fc0c6a
Fabrice Di Meglio [Fri, 18 Jul 2014 22:20:34 +0000 (15:20 -0700)]
Fix overdraw and do some layout optimizations
- use a specific layout for the Dashboard and for the Preferences
- use a specific background for the Dashboard and for the Preferences
The main idea here is that you cannot have the same layout / background
because the Dashboard is using the "Z elevation" for having its card
"poping up"
Change-Id: I42b7c91efea14315b8a60cf3876938a7f1d1e0b3
Fabrice Di Meglio [Fri, 18 Jul 2014 23:59:32 +0000 (23:59 +0000)]
Merge "Fix overdraw and do some layout optimizations" into lmp-dev
PauloftheWest [Fri, 18 Jul 2014 18:12:45 +0000 (18:12 +0000)]
am
772cf206: Merge "Minor string fixes for translation" into lmp-dev
* commit '
772cf2061685e5c7df4b1ebedd1249243cde6f74':
Minor string fixes for translation
Andres Morales [Fri, 18 Jul 2014 16:52:06 +0000 (16:52 +0000)]
am
5b452a11: am
7ab8929c: On factory reset, wipe the stored account challenges
* commit '
5b452a11631338a12fc3ee09ca091c900fd7a8ba':
On factory reset, wipe the stored account challenges
Andres Morales [Fri, 18 Jul 2014 16:46:20 +0000 (16:46 +0000)]
am
7ab8929c: On factory reset, wipe the stored account challenges
* commit '
7ab8929cc6ecbd1ba14c0d6ecb393b31f9a6fcda':
On factory reset, wipe the stored account challenges
Andres Morales [Thu, 10 Jul 2014 23:10:43 +0000 (16:10 -0700)]
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
Amith Yamasani [Fri, 18 Jul 2014 15:06:05 +0000 (15:06 +0000)]
am
66926227: am
d0a057cc: Merge "Improvements to user settings" into lmp-dev
* commit '
66926227ebabd856f872d12c22a11ffd748c48b0':
Improvements to user settings
Amith Yamasani [Fri, 18 Jul 2014 15:02:03 +0000 (15:02 +0000)]
am
d0a057cc: Merge "Improvements to user settings" into lmp-dev
* commit '
d0a057ccc89f65f0971a2e7c42758b0fedf7c501':
Improvements to user settings
Alexandra Gherghina [Fri, 18 Jul 2014 11:45:43 +0000 (11:45 +0000)]
am
527f0d20: am
89265a30: Hide Settings launcher icon for a managed profile
* commit '
527f0d2066dd976cf93485262c54c8e3f9ad4768':
Hide Settings launcher icon for a managed profile
Alexandra Gherghina [Fri, 18 Jul 2014 11:45:42 +0000 (11:45 +0000)]
am
a41da78e: am
ccdc369e: Merge "Add account for managed user" into lmp-dev
* commit '
a41da78efb6021bdf72809f2eae0ff86d2859f3e':
Add account for managed user
Alexandra Gherghina [Fri, 18 Jul 2014 11:22:36 +0000 (11:22 +0000)]
am
89265a30: Hide Settings launcher icon for a managed profile
* commit '
89265a3026faad35107d6ef08f9a59f680819aaf':
Hide Settings launcher icon for a managed profile
Alexandra Gherghina [Fri, 18 Jul 2014 11:22:35 +0000 (11:22 +0000)]
am
ccdc369e: Merge "Add account for managed user" into lmp-dev
* commit '
ccdc369e4772ed3d97508938861ee00457f8ba3e':
Add account for managed user
Alexandra Gherghina [Thu, 17 Jul 2014 19:29:34 +0000 (20:29 +0100)]
Hide Settings launcher icon for a managed profile
This makes the Settings icon disappear at the next reboot.
Bug:
16369104
Change-Id: Ic0a394413a0f2dc573d340394d2cd24388535856
Fabrice Di Meglio [Fri, 18 Jul 2014 03:09:58 +0000 (03:09 +0000)]
am
c63f16ce: am
c08c67be: Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev
* commit '
c63f16ce0d78982d8372836cd3efea05f13e6fb6':
Fix alignment of ActionBar title and Preferences for tablet UI
Tadashi G. Takaoka [Fri, 18 Jul 2014 03:09:37 +0000 (03:09 +0000)]
am
740de4d3: am
3ac7802e: Fix duplicate string resources
* commit '
740de4d39c95a4e9613bd744da9ec0ecafab7124':
Fix duplicate string resources
Fabrice Di Meglio [Fri, 18 Jul 2014 02:43:49 +0000 (02:43 +0000)]
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
Fabrice Di Meglio [Fri, 18 Jul 2014 02:36:14 +0000 (19:36 -0700)]
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
Tadashi G. Takaoka [Fri, 18 Jul 2014 02:05:45 +0000 (02:05 +0000)]
am
3ac7802e: Fix duplicate string resources
* commit '
3ac7802ee6c8b6d3e1befa7b3c6a970201fc3d24':
Fix duplicate string resources
Tadashi G. Takaoka [Fri, 18 Jul 2014 01:07:26 +0000 (18:07 -0700)]
Fix duplicate string resources
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
Michael Wright [Fri, 18 Jul 2014 00:32:08 +0000 (00:32 +0000)]
am
87b69c30: am
b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
* commit '
87b69c303063321e871028ff713c26e200d32cc4':
Add OP_PROJECT_MEDIA to AppOps
Paul Lawrence [Thu, 17 Jul 2014 23:48:05 +0000 (23:48 +0000)]
am
2126ac9f: am
eb0628bb: Merge "Final touches to material theme for phones" into lmp-dev
* commit '
2126ac9fa117bd21be947ba3af182169798d8d00':
Final touches to material theme for phones
Michael Wright [Thu, 17 Jul 2014 22:03:58 +0000 (22:03 +0000)]
am
b8a90e50: Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
* commit '
b8a90e5042c0b112a44d7619fd2928bb92a4a6dc':
Add OP_PROJECT_MEDIA to AppOps
Tadashi G. Takaoka [Sat, 19 Jul 2014 19:11:03 +0000 (19:11 +0000)]
Merge "Remove unnecessary saved persistent preference" into lmp-dev
Tadashi G. Takaoka [Sat, 12 Jul 2014 07:37:38 +0000 (16:37 +0900)]
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
Maurice Lam [Fri, 18 Jul 2014 19:07:09 +0000 (19:07 +0000)]
Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev
Maurice Lam [Tue, 1 Jul 2014 22:14:19 +0000 (15:14 -0700)]
[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
PauloftheWest [Fri, 18 Jul 2014 18:08:07 +0000 (18:08 +0000)]
Merge "Minor string fixes for translation" into lmp-dev
PauloftheWest [Fri, 18 Jul 2014 18:01:55 +0000 (11:01 -0700)]
Minor string fixes for translation
Bug:
16321903
Bug:
16321706
Bug:
16321066
Bug:
16321704
Change-Id: I65d0d8c89a8d0e7bf2ff2280aab32cd63b9fe369
Fabrice Di Meglio [Fri, 18 Jul 2014 02:40:50 +0000 (02:40 +0000)]
Merge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev
Zoltan Szatmary-Ban [Thu, 17 Jul 2014 21:29:47 +0000 (21:29 +0000)]
am
ef8a48c8: am
cda76822: Merge "Update Location Settings for Enterprise" into lmp-dev
* commit '
ef8a48c85b8c9ff31e731c82f83bf183e4a8994b':
Update Location Settings for Enterprise
Chris Craik [Thu, 17 Jul 2014 21:29:38 +0000 (21:29 +0000)]
am
4ce86a69: am
dd82be9c: Merge "Access high contrast setting directly" into lmp-dev
* commit '
4ce86a69a8b2c5d89b7e67c9aa08eda03961efb7':
Access high contrast setting directly
Alexandra Gherghina [Thu, 17 Jul 2014 21:29:33 +0000 (21:29 +0000)]
am
46ad8100: am
c42d4059: Remove account for a managed user
* commit '
46ad8100475c8bb2c5aa3ee7787674ef0669c634':
Remove account for a managed user
PauloftheWest [Thu, 17 Jul 2014 21:29:25 +0000 (21:29 +0000)]
am
995448c7: am
08ee22cb: Merge "Removed extraneous string from strings.xml" into lmp-dev
* commit '
995448c76a6b10782c05b968d3e8b656552c06e1':
Removed extraneous string from strings.xml
Alexandra Gherghina [Thu, 17 Jul 2014 21:29:23 +0000 (21:29 +0000)]
am
84d71954: am
7c81c1d1: Handle managing accounts for a managed profile
* commit '
84d719542d430bd3e0074925629ae3d51fd561f9':
Handle managing accounts for a managed profile
Paul Lawrence [Thu, 17 Jul 2014 21:04:25 +0000 (21:04 +0000)]
am
eb0628bb: Merge "Final touches to material theme for phones" into lmp-dev
* commit '
eb0628bb02e5945acc0b5fe9da7082b279f043d6':
Final touches to material theme for phones
Jeff Davidson [Fri, 18 Jul 2014 20:55:23 +0000 (20:55 +0000)]
Merge "Link WifiAssistant card with actual settings." into lmp-dev
Michael Wright [Thu, 17 Jul 2014 21:59:07 +0000 (21:59 +0000)]
Merge "Add OP_PROJECT_MEDIA to AppOps" into lmp-dev
Alexandra Gherghina [Thu, 17 Jul 2014 20:59:32 +0000 (20:59 +0000)]
am
a4b48a95: am
b8fff27c: Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev
* commit '
a4b48a956f3118c85f93123b1b85ca4abb7069dd':
Handle choosing and adding accounts for a managed profile
Dianne Hackborn [Thu, 17 Jul 2014 20:59:13 +0000 (20:59 +0000)]
am
d0a94769: am
be875db5: Merge "Battery chart fixes." into lmp-dev
* commit '
d0a947692de3e618fa4ed6a5f7f72c6714e088da':
Battery chart fixes.
Amith Yamasani [Thu, 17 Jul 2014 20:59:08 +0000 (20:59 +0000)]
am
26523d28: am
f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev
* commit '
26523d28ad6bd14e30196a990a849c6ba5395177':
Follow split of DISALLOW_TELEPHONY
Amith Yamasani [Thu, 17 Jul 2014 20:58:49 +0000 (20:58 +0000)]
am
0e1aaa0c: am
d888b543: Revert "Update Location Settings for Enterprise" due to build breakage.
* commit '
0e1aaa0cc8a95d014314220c2453c6606f13428b':
Revert "Update Location Settings for Enterprise" due to build breakage.
Zoltan Szatmary-Ban [Thu, 17 Jul 2014 20:57:06 +0000 (20:57 +0000)]
am
fc9bf4b5: am
ca153c55: Update Location Settings for Enterprise
* commit '
fc9bf4b50b343eb112947baa3ae29fa9754bb369':
Update Location Settings for Enterprise
Jeff Davidson [Thu, 17 Jul 2014 17:28:53 +0000 (10:28 -0700)]
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
Zoltan Szatmary-Ban [Thu, 17 Jul 2014 20:16:28 +0000 (20:16 +0000)]
am
cda76822: Merge "Update Location Settings for Enterprise" into lmp-dev
* commit '
cda76822c49ba80c8e1f2d000bb80058858f4712':
Update Location Settings for Enterprise
Chris Craik [Thu, 17 Jul 2014 20:16:28 +0000 (20:16 +0000)]
am
dd82be9c: Merge "Access high contrast setting directly" into lmp-dev
* commit '
dd82be9c705196d93986f356f464e6ebfed01002':
Access high contrast setting directly
Alexandra Gherghina [Thu, 17 Jul 2014 20:02:11 +0000 (20:02 +0000)]
am
c42d4059: Remove account for a managed user
* commit '
c42d4059b59848bef7bea550522e29d4ef95e18b':
Remove account for a managed user
Alexandra Gherghina [Fri, 4 Jul 2014 10:37:17 +0000 (11:37 +0100)]
Remove account for a managed user
Bug:
16056552
Change-Id: Iad24856cab908ed40c32af799ca2c41fe85b6b45
PauloftheWest [Thu, 17 Jul 2014 19:53:19 +0000 (19:53 +0000)]
am
08ee22cb: Merge "Removed extraneous string from strings.xml" into lmp-dev
* commit '
08ee22cb35eadfdacfbb010fc157b3e5febbdd6e':
Removed extraneous string from strings.xml
Alexandra Gherghina [Fri, 18 Jul 2014 09:50:57 +0000 (09:50 +0000)]
Merge "Add account for managed user" into lmp-dev
Alexandra Gherghina [Mon, 7 Jul 2014 14:10:15 +0000 (15:10 +0100)]
Add account for managed user
Bug:
16056552
Change-Id: I225a1b447d9b4024703b82be8a1fa66359d9e9a1
Alexandra Gherghina [Thu, 17 Jul 2014 19:49:41 +0000 (19:49 +0000)]
am
7c81c1d1: Handle managing accounts for a managed profile
* commit '
7c81c1d1afd57e61eb4b3000a952f95aa9782c64':
Handle managing accounts for a managed profile
Alexandra Gherghina [Thu, 17 Jul 2014 19:45:36 +0000 (19:45 +0000)]
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
Zoltan Szatmary-Ban [Thu, 17 Jul 2014 20:14:34 +0000 (20:14 +0000)]
Merge "Update Location Settings for Enterprise" into lmp-dev
Zoltan Szatmary-Ban [Mon, 16 Jun 2014 12:08:24 +0000 (13:08 +0100)]
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
Alexandra Gherghina [Tue, 1 Jul 2014 14:05:17 +0000 (15:05 +0100)]
Handle managing accounts for a managed profile
Bug:
15466880
Change-Id: Icf0e06c954269426b500f0e5fbcdf3346c59eb9d
Dianne Hackborn [Thu, 17 Jul 2014 19:25:51 +0000 (19:25 +0000)]
am
be875db5: Merge "Battery chart fixes." into lmp-dev
* commit '
be875db541d673aa62dd99acebc523a26018616e':
Battery chart fixes.
Amith Yamasani [Thu, 17 Jul 2014 19:21:46 +0000 (19:21 +0000)]
am
f1d56ebb: Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev
* commit '
f1d56ebb111d10779b25f1105c3077cd9fd39890':
Follow split of DISALLOW_TELEPHONY
Baligh Uddin [Sun, 20 Jul 2014 02:27:08 +0000 (02:27 +0000)]
Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
Baligh Uddin [Sat, 19 Jul 2014 20:05:24 +0000 (13:05 -0700)]
Remove deprecated locales - DO NOT MERGE
Change-Id: Ibf5ac73ae0784925297180cfec0236687d584fd4
Paul Lawrence [Thu, 17 Jul 2014 20:58:43 +0000 (20:58 +0000)]
Merge "Final touches to material theme for phones" into lmp-dev
Paul Lawrence [Wed, 16 Jul 2014 17:21:04 +0000 (10:21 -0700)]
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
Amith Yamasani [Thu, 17 Jul 2014 18:31:38 +0000 (18:31 +0000)]
am
d888b543: Revert "Update Location Settings for Enterprise" due to build breakage.
* commit '
d888b543b2c188e59ea537ba4e73bf9253fbfc93':
Revert "Update Location Settings for Enterprise" due to build breakage.
Amith Yamasani [Thu, 17 Jul 2014 18:26:38 +0000 (18:26 +0000)]
Revert "Update Location Settings for Enterprise" due to
build breakage.
This reverts commit
ca153c55dda9e654f20cd21897fedf986bb95a2e.
Change-Id: Id6d6c98e8504f50b1764bcb87052eb567b6284a1
Zoltan Szatmary-Ban [Thu, 17 Jul 2014 18:03:56 +0000 (18:03 +0000)]
am
ca153c55: Update Location Settings for Enterprise
* commit '
ca153c55dda9e654f20cd21897fedf986bb95a2e':
Update Location Settings for Enterprise
Fabrice Di Meglio [Sat, 19 Jul 2014 02:19:50 +0000 (02:19 +0000)]
Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev
Fabrice Di Meglio [Sat, 19 Jul 2014 02:12:36 +0000 (19:12 -0700)]
Fix Utils.prepareCustomPreferencesList()
- and thus fix padding for all Fragments using it
See bug: #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I862c96d626ed906cbdafcfb40fa0e07bb804160f
Amith Yamasani [Fri, 18 Jul 2014 14:58:58 +0000 (14:58 +0000)]
Merge "Improvements to user settings" into lmp-dev