OSDN Git Service
Amith Yamasani [Tue, 29 Jul 2014 23:47:00 +0000 (23:47 +0000)]
am
ba9643b9: Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev
* commit '
ba9643b92c6fa481152f55b862442f609c1e7410':
Implement SET_PROFILE_OWNER intent
Fabrice Di Meglio [Tue, 29 Jul 2014 23:40:30 +0000 (23:40 +0000)]
am
9ee40022: Merge "Make Battery History chart non selectable" into lmp-dev
* commit '
9ee4002288cd2bc455a5def8316456fd74c2551c':
Make Battery History chart non selectable
Fabrice Di Meglio [Tue, 29 Jul 2014 23:26:04 +0000 (23:26 +0000)]
am
db7d2d16: Merge "Fix bug #
16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)" into lmp-dev
* commit '
db7d2d16b1b3a7fdad8657a57fdcf8801e72a2c4':
Fix bug #
16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)
Fabrice Di Meglio [Tue, 29 Jul 2014 23:13:41 +0000 (23:13 +0000)]
am
76307f52: Merge "Fix bug #
16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment@
3c1d9ecb was not registered" into lmp-dev
* commit '
76307f52d0cb097f832aec2a353ee31bfdff78a7':
Fix bug #
16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@
3c1d9ecb was not registered
Fabrice Di Meglio [Tue, 29 Jul 2014 23:34:26 +0000 (23:34 +0000)]
Merge "Make Battery History chart non selectable" into lmp-dev
Fabrice Di Meglio [Tue, 29 Jul 2014 23:29:00 +0000 (16:29 -0700)]
Make Battery History chart non selectable
- ... because it should not be selectable
See bug: #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I625d1533991623f5c3897be15ccfa48fd0fc02f8
Fabrice Di Meglio [Tue, 29 Jul 2014 23:15:27 +0000 (16:15 -0700)]
Fix bug #
16623129 Stability: Settings: NPE in RunningProcessesView...
startServiceDetailsActivity(RunningProcessesView.java:394)
- make the ListView header non selectable
Change-Id: Ic5e888a7d1d3d1df1bcb59f3027e4385d46ba5ca
Fabrice Di Meglio [Tue, 29 Jul 2014 23:02:22 +0000 (16:02 -0700)]
Fix bug #
16660405 Stability: ISE in Settings: Observer ...
com.android.settings.SettingsPreferenceFragment$1@
3c1d9ecb was not registered
- use a monitor to control registering / unregistering
Change-Id: Id66dd698abf92643c97938e2091c3be38e6b78bd
Fabrice Di Meglio [Tue, 29 Jul 2014 23:07:27 +0000 (23:07 +0000)]
Merge "Fix bug #
16660405 Stability: ISE in Settings: Observer ... com.android.settings.SettingsPreferenceFragment$1@
3c1d9ecb was not registered" into lmp-dev
Svetoslav [Tue, 29 Jul 2014 20:24:01 +0000 (20:24 +0000)]
am
01daaca5: Remove unnecessary code.
* commit '
01daaca5475930e394295b06f5a46dc057b44b0f':
Remove unnecessary code.
Svetoslav [Tue, 29 Jul 2014 20:16:12 +0000 (13:16 -0700)]
Remove unnecessary code.
Change-Id: I4a81cd7f855bb075ab71f6c6c812288e3677c90a
Fabrice Di Meglio [Tue, 29 Jul 2014 17:24:31 +0000 (17:24 +0000)]
am
d5ec63ad: Merge "Fix bug #
16382239 "Searching for Printers" progress bar is not Material / Quantum" into lmp-dev
* commit '
d5ec63ad5166b2a6530c2958819a053cccf4ec79':
Fix bug #
16382239 "Searching for Printers" progress bar is not Material / Quantum
Jay Civelli [Tue, 29 Jul 2014 17:02:48 +0000 (17:02 +0000)]
am
09b5228a: New activity that asks users to confirm their pattern. DO NOT MERGE
* commit '
09b5228ae56283ebcb69d1c295033c74ea868ae5':
New activity that asks users to confirm their pattern. DO NOT MERGE
Jay Civelli [Fri, 11 Jul 2014 00:27:07 +0000 (17:27 -0700)]
New activity that asks users to confirm their pattern. DO NOT MERGE
Adds an activity that prompts the user for their PIN/password/pattern.
cherry-pick from master
b88e8577b9049392aa50649cb40edc845d43d689
Bug
16242766
Change-Id: I3468215a8ac522a06de6573c93a5f5a6dc72ee2d
Alexandra Gherghina [Tue, 29 Jul 2014 15:31:48 +0000 (15:31 +0000)]
am
4a45be2f: Merge "Move global sync settings dialogs to the right screen" into lmp-dev
* commit '
4a45be2ff83e1b3b9bd52be523639d100311bec3':
Move global sync settings dialogs to the right screen
Alexandra Gherghina [Tue, 29 Jul 2014 15:27:24 +0000 (15:27 +0000)]
am
9017d3fd: Update the resource name to the new ic_corp prefix one.
* commit '
9017d3fdd607b8978299578721303b8140a64c22':
Update the resource name to the new ic_corp prefix one.
Alexandra Gherghina [Tue, 29 Jul 2014 10:34:28 +0000 (11:34 +0100)]
Update the resource name to the new ic_corp prefix one.
Bug:
16369104
Change-Id: I0cd2188b0ac1806487678c568db068995a1e9142
Alexandra Gherghina [Tue, 29 Jul 2014 13:24:25 +0000 (13:24 +0000)]
am
a6145a65: Toggle between primary and managed profile in App notif settings
* commit '
a6145a656af1241fd771038715cf839a8fce76e1':
Toggle between primary and managed profile in App notif settings
Alexandra Gherghina [Thu, 24 Jul 2014 16:28:36 +0000 (17:28 +0100)]
Toggle between primary and managed profile in App notif settings
This adds a spinner to the app notifications screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.
Bug:
16369104
Change-Id: I31c2fb4c0bc318fb8fa5c152621a29fd0c4bb403
Zoltan Szatmary-Ban [Tue, 29 Jul 2014 12:49:32 +0000 (12:49 +0000)]
am
0598e6f6: Merge "Fix refresh issue of badged icons in Battery Settings" into lmp-dev
* commit '
0598e6f6842ad08af1d8dbb31aa3ddd3df7e37ed':
Fix refresh issue of badged icons in Battery Settings
Zoltan Szatmary-Ban [Tue, 29 Jul 2014 12:49:27 +0000 (12:49 +0000)]
am
74f34e49: Merge "Update Data Usage Settings for Enterprise" into lmp-dev
* commit '
74f34e496fc460842aa558512de03187f5ad9b2c':
Update Data Usage Settings for Enterprise
Alexandra Gherghina [Tue, 29 Jul 2014 12:49:26 +0000 (12:49 +0000)]
am
11b8bda9: Refactors listening logic in AccountSettings
* commit '
11b8bda93cf3acf3b699eeb479a99e09682a369d':
Refactors listening logic in AccountSettings
Alexandra Gherghina [Tue, 29 Jul 2014 12:49:25 +0000 (12:49 +0000)]
am
fe47a8dc: Toggle between primary and managed profile in Print Settings
* commit '
fe47a8dc89fe0393dae16b1c2152c901feab4dcb':
Toggle between primary and managed profile in Print Settings
Alexandra Gherghina [Wed, 23 Jul 2014 15:19:08 +0000 (16:19 +0100)]
Refactors listening logic in AccountSettings
This is required to make sure that we do not leak broadcast receivers.
No user-visible changes are present.
Bug:
15466880
Change-Id: I90fcf9f8281a786948d862f48a3d7e7ac2bbe6ba
Alexandra Gherghina [Fri, 18 Jul 2014 16:23:37 +0000 (17:23 +0100)]
Toggle between primary and managed profile in Print Settings
This adds a spinner to the print settings screen which can be used to toggle
between the Settings app in the primary and managed profile so that the user
can edit settings belonging to both profiles.
Bug:
16369104
Change-Id: I2556a331d09379c2a501bc6b192ab1631b5215f5
John Spurlock [Tue, 29 Jul 2014 02:15:24 +0000 (02:15 +0000)]
am
b8ec3434: Settings: Carve out app-level notifcation settings dialog.
* commit '
b8ec34346495245043933ac0f1b78781ae5054db':
Settings: Carve out app-level notifcation settings dialog.
John Spurlock [Sun, 27 Jul 2014 17:33:34 +0000 (13:33 -0400)]
Settings: Carve out app-level notifcation settings dialog.
Bug:
16208321
Change-Id: I46574618518e8fe4cbef70e80204cc7bb7cb76e9
Fabrice Di Meglio [Tue, 29 Jul 2014 02:04:05 +0000 (02:04 +0000)]
am
3a166613: Merge "Fix bug #
16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev
* commit '
3a166613becfb8de08939616d2dd6d28c180a130':
Fix bug #
16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)
Fabrice Di Meglio [Tue, 29 Jul 2014 01:35:46 +0000 (01:35 +0000)]
am
54bac5f2: Merge "Fix App Info padding" into lmp-dev
* commit '
54bac5f2c6e58fca8d1aa5cb4f5ed053a3559c02':
Fix App Info padding
Fabrice Di Meglio [Tue, 29 Jul 2014 01:03:58 +0000 (01:03 +0000)]
am
173e3161: Merge "Some code formatting" into lmp-dev
* commit '
173e31619a34436e8cb100fb30f0e3477b7edf8e':
Some code formatting
Maurice Lam [Tue, 29 Jul 2014 00:47:59 +0000 (00:47 +0000)]
am
569aec7b: [WifiSetup] Fix auto-finish suppression logic
* commit '
569aec7b4d6cc9e5268a059d9f18f271afadb706':
[WifiSetup] Fix auto-finish suppression logic
Alan Viverette [Tue, 29 Jul 2014 00:47:58 +0000 (00:47 +0000)]
am
744c6b22: Remove TimePicker and DatePicker dialog themes
* commit '
744c6b22513f3b51f035b2038a59d35c97c4da6c':
Remove TimePicker and DatePicker dialog themes
Maurice Lam [Fri, 25 Jul 2014 19:40:55 +0000 (12:40 -0700)]
[WifiSetup] Fix auto-finish suppression logic
The flag needs to be saved into the instance state, and the flag is
set as soon as auto-finish occurs to avoid multi-launching the next
activity.
Bug:
16561238
Change-Id: I954b7ff77b2d2fc35684ea59cca7d7cd588a6aab
Alan Viverette [Mon, 28 Jul 2014 23:29:58 +0000 (16:29 -0700)]
Remove TimePicker and DatePicker dialog themes
Also moves TimePicker widget style to appropriate XML file / namespace.
BUG:
14973897
Change-Id: I0eb68a59d8f2800d37cc949c948689d47c34486f
Baligh Uddin [Mon, 28 Jul 2014 23:15:48 +0000 (23:15 +0000)]
am
c4108655: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
c4108655e114631cf71b4f505357936e53469fe4':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Mon, 28 Jul 2014 23:15:47 +0000 (23:15 +0000)]
am
d197608e: Merge "Fix bug #
14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
* commit '
d197608e8340765e736c234dabffae8d3dc695e1':
Fix bug #
14323097 Launching Security from Settings search results ...show header as Settings instead of Security
Fabrice Di Meglio [Tue, 29 Jul 2014 01:59:53 +0000 (01:59 +0000)]
Merge "Fix bug #
16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)" into lmp-dev
Fabrice Di Meglio [Tue, 29 Jul 2014 01:55:29 +0000 (18:55 -0700)]
Fix bug #
16384201 Security > "Device administrators" layout is wrong on N10 (tablet UI)
- add correct padding
Change-Id: I08a34839f94e899469b429dd83e301c5418155f5
Fabrice Di Meglio [Tue, 29 Jul 2014 01:25:14 +0000 (18:25 -0700)]
Fix App Info padding
- need to add to the previous defined on instead of replacing it
- verified also that Notification Station padding is ok too
See bug: #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I06394bec2a5baa548f34f3fe7ec19d60172a98e8
Fabrice Di Meglio [Tue, 29 Jul 2014 00:54:30 +0000 (17:54 -0700)]
Some code formatting
- add some extra lines into those XML layout files
Change-Id: I13c004f23a5c59d46702a93b1cfa7e9b9587b8c2
Fabrice Di Meglio [Mon, 28 Jul 2014 22:47:21 +0000 (15:47 -0700)]
Fix bug #
14323097 Launching Security from Settings search results
...show header as Settings instead of Security
- add missing title to a few fragments
Change-Id: I74fb95ca58269ff1c77afa20ed40e7042873130c
Fabrice Di Meglio [Tue, 29 Jul 2014 01:01:03 +0000 (01:01 +0000)]
Merge "Some code formatting" into lmp-dev
Fabrice Di Meglio [Mon, 28 Jul 2014 22:54:48 +0000 (22:54 +0000)]
Merge "Fix bug #
14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
Jeff Davidson [Mon, 28 Jul 2014 20:41:15 +0000 (20:41 +0000)]
am
6207391a: Fix strings for Wi-Fi Assistant dialog.
* commit '
6207391ac240d130194f1a0cad7b5f10535d45ac':
Fix strings for Wi-Fi Assistant dialog.
Jeff Davidson [Fri, 25 Jul 2014 21:58:20 +0000 (14:58 -0700)]
Fix strings for Wi-Fi Assistant dialog.
Remove some redundant strings that are no longer needed.
Change-Id: I039839989358efa322bac13129d91f7c764fd387
PauloftheWest [Mon, 28 Jul 2014 20:03:10 +0000 (20:03 +0000)]
am
34652902: Merge "Removed Wi-Fi icon from Saved Networks." into lmp-dev
* commit '
346529021de468cbf98fc419c6bab04dc3f3fc52':
Removed Wi-Fi icon from Saved Networks.
PauloftheWest [Mon, 28 Jul 2014 19:35:52 +0000 (19:35 +0000)]
am
68af3173: Merge "Fixed a bug where Wi-Fi would should networks out of range." into lmp-dev
* commit '
68af317321693984ec54caa6abcb39f6627d291f':
Fixed a bug where Wi-Fi would should networks out of range.
PauloftheWest [Mon, 28 Jul 2014 18:43:47 +0000 (18:43 +0000)]
am
069ed0a6: Merge "Minor character limit fixes for translation." into lmp-dev
* commit '
069ed0a678dca7a00fb236ed3ba5e54ea4ee2905':
Minor character limit fixes for translation.
PauloftheWest [Mon, 28 Jul 2014 17:49:35 +0000 (17:49 +0000)]
am
76c70b07: Merge "Fixed minor character limits for translation." into lmp-dev
* commit '
76c70b07270f3e0bea5e94f172d5115c8dffef12':
Fixed minor character limits for translation.
Alexandra Gherghina [Mon, 28 Jul 2014 14:29:59 +0000 (14:29 +0000)]
am
28ff0ff0: Update string displayed when we can\'t remove an account
* commit '
28ff0ff0f19b3ef2a665d72020509d106bf6e73f':
Update string displayed when we can't remove an account
Alexandra Gherghina [Fri, 25 Jul 2014 15:22:17 +0000 (16:22 +0100)]
Update string displayed when we can't remove an account
Bug:
14642886
Change-Id: Ie4a902cfd1ae41f2a1bae28432874e7b8b34b50d
Alexandra Gherghina [Mon, 28 Jul 2014 11:59:19 +0000 (11:59 +0000)]
am
95b86a54: Refactoring useless UserUtils class
* commit '
95b86a5488a27d95bda8b6db1f608d6ce55dae8a':
Refactoring useless UserUtils class
Tadashi G. Takaoka [Mon, 28 Jul 2014 11:58:59 +0000 (11:58 +0000)]
am
72f70723: Merge "Preserve enabled subtypes across disabling and re-enabling an IME" into lmp-dev
* commit '
72f7072328539d58ba02a6851e9e292a750f7d20':
Preserve enabled subtypes across disabling and re-enabling an IME
Lajos Molnar [Mon, 28 Jul 2014 11:58:57 +0000 (11:58 +0000)]
am
dc3bc0ba: Make nuplayer the default media player.
* commit '
dc3bc0ba6be006c89b9674cdcc23b3972b7b1052':
Make nuplayer the default media player.
Alexandra Gherghina [Thu, 24 Jul 2014 18:13:25 +0000 (19:13 +0100)]
Refactoring useless UserUtils class
Bug:
16542609
Change-Id: Iadb83c5e378cd342ea89d6e224ddc45e6f940c8b
Lajos Molnar [Mon, 28 Jul 2014 04:35:37 +0000 (21:35 -0700)]
Make nuplayer the default media player.
Update nuplayer settings to use awesomeplayer key.
Bug:
11784824
Change-Id: I25ec4b4bd289e3f00c3d299b1a3a5275d1ba73fe
Tadashi G. Takaoka [Mon, 28 Jul 2014 02:39:53 +0000 (02:39 +0000)]
am
935f97cd: Merge "Show "up navigate" icon in input method subtype enabler" into lmp-dev
* commit '
935f97cd9bc38fefc5b3358a2151440b85c54c32':
Show "up navigate" icon in input method subtype enabler
Baligh Uddin [Mon, 28 Jul 2014 23:13:05 +0000 (23:13 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Mon, 28 Jul 2014 20:01:38 +0000 (13:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9653e86e7b7264646b35675fd40f6d582dc09d58
Auto-generated-cl: translation import
PauloftheWest [Mon, 28 Jul 2014 19:58:41 +0000 (19:58 +0000)]
Merge "Removed Wi-Fi icon from Saved Networks." into lmp-dev
PauloftheWest [Mon, 28 Jul 2014 19:55:45 +0000 (12:55 -0700)]
Removed Wi-Fi icon from Saved Networks.
Bug:
16569017
Change-Id: I13b7e0ae2a364d2660c8bfa42ebdf0b2cf3ab407
PauloftheWest [Mon, 28 Jul 2014 19:23:18 +0000 (12:23 -0700)]
Fixed a bug where Wi-Fi would should networks out of range.
Bug:
16569017
Change-Id: Ie2d094aed2fcb1b2471ae1105b6782105e6be5ce
PauloftheWest [Mon, 28 Jul 2014 19:32:29 +0000 (19:32 +0000)]
Merge "Fixed a bug where Wi-Fi would should networks out of range." into lmp-dev
Amith Yamasani [Sun, 27 Jul 2014 11:30:12 +0000 (11:30 +0000)]
am
bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev
* commit '
bed3a7b6aa64a82504057a10a1c38a82feffcc38':
Increase string lengths for translation
Amith Yamasani [Sat, 26 Jul 2014 23:57:25 +0000 (23:57 +0000)]
am
1a77577d: Change tablet to device so it doesn\'t say tablet on a phone
* commit '
1a77577da755b0921a3b77fc66ff9b99b50b59f6':
Change tablet to device so it doesn't say tablet on a phone
Amith Yamasani [Sat, 26 Jul 2014 23:47:00 +0000 (16:47 -0700)]
Change tablet to device so it doesn't say tablet on a phone
Bug:
16447351
Change-Id: I3d10e1e1546602c4155de70650e6f9ee582fe552
Amith Yamasani [Sat, 26 Jul 2014 14:16:15 +0000 (14:16 +0000)]
am
247520c3: More User Settings improvements
* commit '
247520c369370885a1c085e53ee679dce0fd55ce':
More User Settings improvements
Amith Yamasani [Fri, 25 Jul 2014 19:52:29 +0000 (12:52 -0700)]
More User Settings improvements
Add a menu checkbox to allow creation of users from lockscreen.
Add a delete icon in restricted profiles settings.
Other little fixes to icons.
Update some strings based on feedback.
Bug:
15761405
Bug:
16550371
Bug:
16298824
Change-Id: Ib876bd57f15c6ce2d71856f72571c6b8b0e3102d
Maurice Lam [Sat, 26 Jul 2014 01:49:37 +0000 (01:49 +0000)]
am
2d4d9a90: [WifiSetup] Don\'t show WiFi assistant card in WifiPickerActivity
* commit '
2d4d9a9067a2904ed75247f83b0f37a086a020b2':
[WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
Maurice Lam [Fri, 18 Jul 2014 01:36:56 +0000 (18:36 -0700)]
[WifiSetup] Don't show WiFi assistant card in WifiPickerActivity
Do not create the assistant card if we are in WifiPickerActivity,
which includes setup wizard and account login.
Bug:
16382431
Change-Id: Id5eaa8040eafe5222e1a5c9276a2a10bedebfd71
Fabrice Di Meglio [Fri, 25 Jul 2014 23:49:24 +0000 (23:49 +0000)]
am
096c0c46: Merge "Implement #
15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev
* commit '
096c0c46fb8cbdfeb05cdfb19d8c98b06403a18d':
Implement #
15841213 Search - index Developer Option only and only if they have been activated
Fabrice Di Meglio [Fri, 25 Jul 2014 23:28:53 +0000 (16:28 -0700)]
Implement #
15841213 Search - index Developer Option only and only if they have been activated
- do not index Developer Options if they are not activated
- index them just after their activation
Change-Id: I54fcc6b55a1f29eb6b19d6e14e3158d4a38a6fe6
Amith Yamasani [Tue, 29 Jul 2014 23:44:36 +0000 (23:44 +0000)]
Merge "Implement SET_PROFILE_OWNER intent" into lmp-dev
Amith Yamasani [Mon, 28 Jul 2014 23:28:36 +0000 (16:28 -0700)]
Implement SET_PROFILE_OWNER intent
This will be shown when a system priv-app tries to add a profile owner
to a device that's already been through setupwizard.
Refactored the Add Device Admin dialog to also be used for this
purpose with additional warning text.
Also, make sure that profile owners cannot be deactivated.
Bug:
16207721
Change-Id: I25499a22718b2219a5a56b158ca2681243751549
Fabrice Di Meglio [Tue, 29 Jul 2014 23:19:52 +0000 (23:19 +0000)]
Merge "Fix bug #
16623129 Stability: Settings: NPE in RunningProcessesView... startServiceDetailsActivity(RunningProcessesView.java:394)" into lmp-dev
Fabrice Di Meglio [Tue, 29 Jul 2014 01:31:37 +0000 (01:31 +0000)]
Merge "Fix App Info padding" into lmp-dev
Amith Yamasani [Sun, 27 Jul 2014 06:06:07 +0000 (06:06 +0000)]
Merge "Increase string lengths for translation" into lmp-dev
Amith Yamasani [Sun, 27 Jul 2014 05:54:40 +0000 (22:54 -0700)]
Increase string lengths for translation
Bug:
16062154
Change-Id: Ib0086f23283f324a18f71ec5f8bab9275567c59f
Fabrice Di Meglio [Fri, 25 Jul 2014 20:17:20 +0000 (20:17 +0000)]
am
a6dbeae6: Merge "Fix bug #
16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen" into lmp-dev
* commit '
a6dbeae65f3c7e924adf5027469064660ba9e825':
Fix bug #
16533532 Settings app crashes on device orientation change ...when "change language" warning dialog is on screen
Fabrice Di Meglio [Fri, 25 Jul 2014 20:03:09 +0000 (13:03 -0700)]
Fix bug #
16533532 Settings app crashes on device orientation change
...when "change language" warning dialog is on screen
- try harder at getting the parent fragment. First try by calling
getParentFragment() and if this is getting a null reference, try
again by using the fragment Id saved during onSaveInstanceState()
Change-Id: I3dbc6a229224c8770ff2c7e432e76b8796c4b099
Alan Viverette [Fri, 25 Jul 2014 19:46:56 +0000 (19:46 +0000)]
am
06363397: Remove -opia color correction modes
* commit '
063633971283a2dd342fc032d3cef65d03de0125':
Remove -opia color correction modes
Alan Viverette [Fri, 25 Jul 2014 17:12:20 +0000 (10:12 -0700)]
Remove -opia color correction modes
The implementations for these are identical to -omaly modes.
Change-Id: Iad67c01d17c6167c530879fa29178ba63a8b876b
Paul Lawrence [Fri, 25 Jul 2014 18:47:41 +0000 (18:47 +0000)]
am
0ee45d5b: Fix Trusted Credentials layout
* commit '
0ee45d5bdc559ba7746dc803429268e8b6dd2092':
Fix Trusted Credentials layout
Fabrice Di Meglio [Fri, 25 Jul 2014 18:47:40 +0000 (18:47 +0000)]
am
dec81120: Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev
* commit '
dec811201f079a48e357f99532996b42406fd5af':
Enforce the presence of the Indexable interface for Indexing
Paul Lawrence [Fri, 25 Jul 2014 16:45:38 +0000 (09:45 -0700)]
Fix Trusted Credentials layout
Now matches security layout. Tested on Volantis and Hammerhead in portrait
and landscape
Bug:
16381087
Change-Id: If7049f6cd241df360d9fb608e1e7e5d45e3d1d54
Amith Yamasani [Fri, 25 Jul 2014 16:46:48 +0000 (16:46 +0000)]
am
2d578ce2: Don\'t use the profile info for name
* commit '
2d578ce29391dc72fde7330ff9ff909347ec531b':
Don't use the profile info for name
Amith Yamasani [Fri, 25 Jul 2014 16:37:33 +0000 (09:37 -0700)]
Don't use the profile info for name
Since we now have a way to directly edit the user's photo/name
via a dialog, don't rely on the Me profile name anymore. That
one will be out of sync with the manual nickname editing.
Bug:
15761405
Change-Id: Ia16c43ddcfd47894b2d2e049802d7de153ea5b94
Fabrice Di Meglio [Fri, 25 Jul 2014 03:03:43 +0000 (03:03 +0000)]
am
8610ff9e: Merge "Fix Preferences background color" into lmp-dev
* commit '
8610ff9ea678201920bf6fb7d3a2b141226f6640':
Fix Preferences background color
Fabrice Di Meglio [Fri, 25 Jul 2014 02:53:47 +0000 (19:53 -0700)]
Enforce the presence of the Indexable interface for Indexing
- check that the Indexable interface has been defined before indexing
Change-Id: Ia61915b2bd1240226ba560ecfd883a115b49da95
Fabrice Di Meglio [Fri, 25 Jul 2014 00:03:04 +0000 (17:03 -0700)]
Fix Preferences background color
- use #
FFFAFAFA instead of pure white
See bug: #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I287eda45950f8c537b7b96df7a2cf996e6e465b4
Fabrice Di Meglio [Thu, 24 Jul 2014 23:23:55 +0000 (23:23 +0000)]
am
a8469d28: Merge "More fixes for QuickLaunchSettings" into lmp-dev
* commit '
a8469d285e1956e2a90a4475ad6e5981dee34223':
More fixes for QuickLaunchSettings
Amith Yamasani [Thu, 24 Jul 2014 23:23:54 +0000 (23:23 +0000)]
am
ee398747: Refactor User Profile editor dialog for reuse
* commit '
ee3987475e1d29e8355bdb9e068149eb01e3fd43':
Refactor User Profile editor dialog for reuse
Amith Yamasani [Thu, 24 Jul 2014 21:13:36 +0000 (14:13 -0700)]
Refactor User Profile editor dialog for reuse
Move the dialog code into a separate class.
Use it from RestrictedProfileSettings
and UserSettings for the current user.
Bug:
15761405
Change-Id: I0b9a95ba8463304525e6a4b8cf3b4ca77b15796f
rich cannings [Thu, 24 Jul 2014 22:47:13 +0000 (22:47 +0000)]
am
b8684d57: Remove "Verify apps" from Security settings
* commit '
b8684d573e1357ee573f26d511a630b39e368d0f':
Remove "Verify apps" from Security settings
Fabrice Di Meglio [Thu, 24 Jul 2014 22:46:35 +0000 (15:46 -0700)]
More fixes for QuickLaunchSettings
- use DialogWhenLarge on tabletUI
- update layouts for following Material theme
Change-Id: If7aa153168eae9d2e72c50e4ae38bcd2fa6bb4bd
Fabrice Di Meglio [Fri, 25 Jul 2014 23:43:15 +0000 (23:43 +0000)]
Merge "Implement #
15841213 Search - index Developer Option only and only if they have been activated" into lmp-dev
Fabrice Di Meglio [Fri, 25 Jul 2014 18:07:34 +0000 (18:07 +0000)]
Merge "Enforce the presence of the Indexable interface for Indexing" into lmp-dev
rich cannings [Mon, 21 Jul 2014 23:12:49 +0000 (16:12 -0700)]
Remove "Verify apps" from Security settings
The setting moved to Google settings
Bug:
15588470
Change-Id: I40c0b6073949a69bfb8f0fa8f9fd405fbf9946de
Fabrice Di Meglio [Fri, 25 Jul 2014 02:59:33 +0000 (02:59 +0000)]
Merge "Fix Preferences background color" into lmp-dev
Baligh Uddin [Thu, 24 Jul 2014 21:52:43 +0000 (21:52 +0000)]
am
c3bd8097: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
c3bd8097d8d4085cbe855ce3f1d570f6edc54891':
Import translations. DO NOT MERGE