OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoMerge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP...
Fabrice Di Meglio [Mon, 21 Jul 2014 18:27:30 +0000 (18:27 +0000)]
Merge "Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS" into lmp-dev

9 years agoFix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFI...
Fabrice Di Meglio [Mon, 21 Jul 2014 18:22:20 +0000 (11:22 -0700)]
Fix bug #16451628 Settings app crashes for intent: android.settings.ACTION_APP_NOTIFICATION_SETTINGS

... and also crash with intent: android.settings.ACTION_OTHER_SOUND_SETTINGS

- add corresponding fragments to the ENTRY_FRAGMENTS array

Change-Id: Ic0c10841dfd7bc87d8573530129290ed172ff608

9 years agoMerge "Fix AppDetails padding on tablet UI" into lmp-dev
Fabrice Di Meglio [Mon, 21 Jul 2014 17:53:44 +0000 (17:53 +0000)]
Merge "Fix AppDetails padding on tablet UI" into lmp-dev

9 years agoMerge "Add Screen pinning back to settings" into lmp-dev
Jason Monk [Mon, 21 Jul 2014 17:17:45 +0000 (17:17 +0000)]
Merge "Add Screen pinning back to settings" into lmp-dev

9 years agoFix showing list of languages for picoTTS
Przemyslaw Szczepaniak [Mon, 21 Jul 2014 15:27:00 +0000 (16:27 +0100)]
Fix showing list of languages for picoTTS

PicoTTS have a tendency to return a
CHECK_VOICE_DATA_MISSING_DATA for its CHECK_TTS_DATA
activity. This blanks the language selection preference.
The fix is to show languages selection for all
results of CHECK_TTS_DATA that are not a total failure
(TextToSpeech.Engine.CHECK_VOICE_DATA_FAIL).

Change-Id: I984d7cc9b0dc830ad2b8195a820f9b6fc4ddf1e0
(cherry picked from commit e0d519f3cf1323f7c83971b6d75f11788d4c961b)

9 years agoAdd Screen pinning back to settings
Jason Monk [Fri, 18 Jul 2014 13:55:41 +0000 (09:55 -0400)]
Add Screen pinning back to settings

Adds a basic screen for screen pinning (previously lock-to-app) to
settings that describes the feature and allows it to be turned on
and off.

Bug: 16378448
Depends on Ide333463f86310eacb7a1d8b6dc7b1aea8722713 for Settings
constant
Change-Id: Id3ef8471794aa01de20efeb947bed95c50d6b954

9 years agoFix AppDetails padding on tablet UI
Fabrice Di Meglio [Sat, 19 Jul 2014 02:58:50 +0000 (19:58 -0700)]
Fix AppDetails padding on tablet UI

- force custom padding

See bug #: 13140648 Settings needs to support the new Quantum Paper theme

Change-Id: I5c26402c10a4e717cda22b320ab0790f598591c2

9 years agoFix Utils.prepareCustomPreferencesList()
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

9 years agoFix the way we select and apply Themes
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

9 years agoFix overdraw and do some layout optimizations
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

9 years agoFix 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

9 years agoMerge "Make TTS setting transition animation consistent." into lmp-dev
Przemyslaw Szczepaniak [Mon, 21 Jul 2014 09:52:53 +0000 (09:52 +0000)]
Merge "Make TTS setting transition animation consistent." into lmp-dev

9 years agoImport 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

9 years agoMerge "Remove deprecated locales - DO NOT MERGE" into lmp-dev
Baligh Uddin [Sun, 20 Jul 2014 02:27:08 +0000 (02:27 +0000)]
Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

9 years agoMerge "Fix Settings behavior when disabling current IME" into lmp-dev
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

9 years agoFix Settings behavior when disabling current IME
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

9 years agoImport 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

9 years agoRemove deprecated locales - DO NOT MERGE
Baligh Uddin [Sat, 19 Jul 2014 20:05:24 +0000 (13:05 -0700)]
Remove deprecated locales - DO NOT MERGE

Change-Id: Ibf5ac73ae0784925297180cfec0236687d584fd4

9 years agoMerge "Remove unnecessary saved persistent preference" into lmp-dev
Tadashi G. Takaoka [Sat, 19 Jul 2014 19:11:03 +0000 (19:11 +0000)]
Merge "Remove unnecessary saved persistent preference" into lmp-dev

9 years agoRemove unnecessary saved persistent preference
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

9 years agoOn 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

9 years agoMerge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev
Fabrice Di Meglio [Sat, 19 Jul 2014 02:19:50 +0000 (02:19 +0000)]
Merge "Fix Utils.prepareCustomPreferencesList()" into lmp-dev

9 years agoMerge "Fix the way we select and apply Themes" into lmp-dev
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

9 years agoMerge "Fix overdraw and do some layout optimizations" into lmp-dev
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

9 years agoUpdate Settings to use new UsageStats API
Adam Lesinski [Fri, 18 Jul 2014 01:30:03 +0000 (18:30 -0700)]
Update Settings to use new UsageStats API

Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9

9 years agoMerge "Link WifiAssistant card with actual settings." into lmp-dev
Jeff Davidson [Fri, 18 Jul 2014 20:55:23 +0000 (20:55 +0000)]
Merge "Link WifiAssistant card with actual settings." into lmp-dev

9 years agoMaterial 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

9 years agoMerge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev
Maurice Lam [Fri, 18 Jul 2014 19:07:09 +0000 (19:07 +0000)]
Merge "[WifiSetup] Mechanism for suspending auto finish" into lmp-dev

9 years ago[WifiSetup] Mechanism for suspending auto finish
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

9 years agoMerge "Minor string fixes for translation" into lmp-dev
PauloftheWest [Fri, 18 Jul 2014 18:08:07 +0000 (18:08 +0000)]
Merge "Minor string fixes for translation" into lmp-dev

9 years agoMinor string fixes for translation
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

9 years agoHide Settings launcher icon for a managed profile
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

9 years agoMerge "Fix alignment of ActionBar title and Preferences for tablet UI" into lmp-dev
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

9 years agoFix duplicate string resources
Tadashi G. Takaoka [Fri, 18 Jul 2014 01:07:26 +0000 (18:07 -0700)]
Fix duplicate string resources

Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311

9 years agoMerge "Add OP_PROJECT_MEDIA to AppOps" 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

9 years agoLink WifiAssistant card with actual settings.
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

9 years agoMerge "Add account for managed user" into lmp-dev
Alexandra Gherghina [Fri, 18 Jul 2014 09:50:57 +0000 (09:50 +0000)]
Merge "Add account for managed user" into lmp-dev

9 years agoAdd account for managed user
Alexandra Gherghina [Mon, 7 Jul 2014 14:10:15 +0000 (15:10 +0100)]
Add account for managed user

Bug: 16056552
Change-Id: I225a1b447d9b4024703b82be8a1fa66359d9e9a1

9 years agoRemove 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

9 years agoMerge "Final touches to material theme for phones" into lmp-dev
Paul Lawrence [Thu, 17 Jul 2014 20:58:43 +0000 (20:58 +0000)]
Merge "Final touches to material theme for phones" into lmp-dev

9 years agoFinal touches to material theme for phones
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

9 years agoMerge "Update Location Settings for Enterprise" into lmp-dev
Zoltan Szatmary-Ban [Thu, 17 Jul 2014 20:14:34 +0000 (20:14 +0000)]
Merge "Update Location Settings for Enterprise" into lmp-dev

9 years agoUpdate Location Settings for Enterprise
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

9 years agoMerge "Improvements to user settings" into lmp-dev
Amith Yamasani [Fri, 18 Jul 2014 14:58:58 +0000 (14:58 +0000)]
Merge "Improvements to user settings" into lmp-dev

9 years agoImprovements to user settings
Amith Yamasani [Fri, 18 Jul 2014 02:13:51 +0000 (19:13 -0700)]
Improvements to user settings

Exiting guest mode from within guest user.
Updated assets and cleaned up/optimized some asset clipping code.

Bug: 15761851
Bug: 16355550
Change-Id: I431e92bac3cbedd46bd1e33cffc4d9f0c576ca69

9 years agoMake TTS setting transition animation consistent.
Przemyslaw Szczepaniak [Thu, 17 Jul 2014 14:56:50 +0000 (15:56 +0100)]
Make TTS setting transition animation consistent.

Bug: 16345246
Change-Id: I729b2f35735ab03424acca07c4a9eb27541a356b

9 years agoUpdate new TimePicker widget to match Settings theme
Alan Viverette [Tue, 15 Jul 2014 01:46:39 +0000 (18:46 -0700)]
Update new TimePicker widget to match Settings theme

BUG: 11218747
Change-Id: I093e16df14832502af0ac28e19e3ad672a51e1d6

9 years agoFix bug #15702424 add-wifi setting screen has no title
Fabrice Di Meglio [Thu, 17 Jul 2014 02:51:06 +0000 (19:51 -0700)]
Fix bug #15702424 add-wifi setting screen has no title

- pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID
- define a new string for the Activity title
- code cleaning: remove a non needed call to getIntent()

Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98

9 years agoMerge "Access high contrast setting directly" into lmp-dev
Chris Craik [Thu, 17 Jul 2014 20:13:11 +0000 (20:13 +0000)]
Merge "Access high contrast setting directly" into lmp-dev

9 years agoAccess high contrast setting directly
Chris Craik [Thu, 17 Jul 2014 18:15:49 +0000 (11:15 -0700)]
Access high contrast setting directly

Change-Id: I6dd6359a9a0ed26955bbe7a9f24e460f85a17383

9 years agoMerge "Removed extraneous string from strings.xml" into lmp-dev
PauloftheWest [Thu, 17 Jul 2014 19:50:06 +0000 (19:50 +0000)]
Merge "Removed extraneous string from strings.xml" into lmp-dev

9 years agoRemoved extraneous string from strings.xml
PauloftheWest [Thu, 17 Jul 2014 19:47:48 +0000 (12:47 -0700)]
Removed extraneous string from strings.xml

Change-Id: I68db708eed866f644a2443bdc90582ae3e5c85eb

9 years agoHandle managing accounts for a managed profile
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

9 years agoMerge "Handle choosing and adding accounts for a managed profile" into lmp-dev
Alexandra Gherghina [Thu, 17 Jul 2014 19:40:51 +0000 (19:40 +0000)]
Merge "Handle choosing and adding accounts for a managed profile" into lmp-dev

9 years agoHandle choosing and adding accounts for a managed profile
Alexandra Gherghina [Fri, 27 Jun 2014 11:33:42 +0000 (12:33 +0100)]
Handle choosing and adding accounts for a managed profile

The user id can now be passed through the app as a fragment argument.

Bug: 15466880
Change-Id: I0e2be20551b4ec8c9226640ac74ea74115156ccd

9 years agoRevert "Update Location Settings for Enterprise" due to
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

9 years agoMerge "Battery chart fixes." into lmp-dev
Dianne Hackborn [Thu, 17 Jul 2014 19:20:55 +0000 (19:20 +0000)]
Merge "Battery chart fixes." into lmp-dev

9 years agoBattery chart fixes.
Dianne Hackborn [Thu, 10 Jul 2014 17:40:58 +0000 (10:40 -0700)]
Battery chart fixes.

When there is no data to show, don't make a crazy collapsed chart.

Also avoid re-creating the chart when scrolling.

And fix various other things.

Change-Id: Ia1895bc7c46e6d830e66f66e66f17726e1e23e3f

9 years agoUpdate Location Settings for Enterprise
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: Ib0fdb9f0c811307875296c37bab6d1fbab919022

9 years agoMerge "Follow split of DISALLOW_TELEPHONY" into lmp-dev
Amith Yamasani [Thu, 17 Jul 2014 19:17:05 +0000 (19:17 +0000)]
Merge "Follow split of DISALLOW_TELEPHONY" into lmp-dev

9 years agoFollow split of DISALLOW_TELEPHONY
Amith Yamasani [Thu, 17 Jul 2014 18:03:41 +0000 (11:03 -0700)]
Follow split of DISALLOW_TELEPHONY

Save both DISALLOW_OUTGOING_CALLS and DISALLOW_SMS together.

Change-Id: I06dd23b3fb4a21f3a22661da17491fc5b0bce4ed

9 years agoFix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is...
Fabrice Di Meglio [Thu, 17 Jul 2014 00:02:41 +0000 (17:02 -0700)]
Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again

- regression from 9717fab53dc65ffe98c0df733b9b4a33bc154496
- add the missing dashboardBackgroundColor attribute to the DialogWhenLarge Themes

Change-Id: I9f7e21d33851966350726e4b3bf79a5a4d12a37f

9 years agoMerge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev
Fabrice Di Meglio [Thu, 17 Jul 2014 02:57:23 +0000 (02:57 +0000)]
Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 17 Jul 2014 02:29:57 +0000 (02:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Jul 2014 01:46:36 +0000 (18:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2e49081933e98dc3109219c21bd737c3e22fd6f7
Auto-generated-cl: translation import

9 years agoMerge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS...
Fabrice Di Meglio [Thu, 17 Jul 2014 00:07:13 +0000 (00:07 +0000)]
Merge "Fix bug #16356067 adb shell am start -a android.settings.DEVICE_INFO_SETTINGS is crashing again" into lmp-dev

9 years agoMerge "Accessibility text contrast control" into lmp-dev
Chris Craik [Thu, 17 Jul 2014 01:26:50 +0000 (01:26 +0000)]
Merge "Accessibility text contrast control" into lmp-dev

9 years agoAccessibility text contrast control
Chris Craik [Wed, 16 Jul 2014 22:13:17 +0000 (15:13 -0700)]
Accessibility text contrast control

b/14624452

Change-Id: I0f6708680eb37cf8e7dc63cae56b639eaf7c8dbd

9 years agoIncrease oem_unlock_enable char limit for translation
Andres Morales [Wed, 16 Jul 2014 22:31:31 +0000 (15:31 -0700)]
Increase oem_unlock_enable char limit for translation

Bug: 16220494
Change-Id: I3974b241bc57130e518dab4b20348e698a276854

9 years agoFix OwnerInfos
Fabrice Di Meglio [Wed, 16 Jul 2014 00:16:37 +0000 (17:16 -0700)]
Fix OwnerInfos

- use a white background for being in line with the Material Theme
- fix padding so that the edge effect is showing full width

See bug: #13140648 Settings needs to support the new Quantum Paper theme

Change-Id: Iea1cf6b104ee8bf5f311f7d3485d0500884dc57a

9 years agoAdd OP_PROJECT_MEDIA to AppOps
Michael Wright [Wed, 9 Jul 2014 01:54:55 +0000 (18:54 -0700)]
Add OP_PROJECT_MEDIA to AppOps

Bug: 9905068
Change-Id: Ie929cfbe0001f6e6645316ea8b2eca13aab35675

9 years agoMerge "Avoid removing switch even listener multiple times" into lmp-dev
Lifu Tang [Wed, 16 Jul 2014 23:16:24 +0000 (23:16 +0000)]
Merge "Avoid removing switch even listener multiple times" into lmp-dev

9 years agoAvoid removing switch even listener multiple times
Lifu Tang [Wed, 16 Jul 2014 19:17:06 +0000 (12:17 -0700)]
Avoid removing switch even listener multiple times

- Fix b/16118646

Change-Id: I36cdc5c8d98dfb63924737af40efff35b9ca2e66

9 years agoMerge "Added Wifi Assistant Card" into lmp-dev
PauloftheWest [Wed, 16 Jul 2014 22:47:23 +0000 (22:47 +0000)]
Merge "Added Wifi Assistant Card" into lmp-dev

9 years agoAdded Wifi Assistant Card
PauloftheWest [Sat, 5 Jul 2014 13:28:56 +0000 (06:28 -0700)]
Added Wifi Assistant Card

+ Show Wi-Fi Assistant card above network list that scroll under the action bar with the rest of the list
+ Display a promo image and text
+ Clicking "Setup" should link to the selected Wi-Fi assistant app (must be open to 3rd parties)
+ Touching "No, Thanks" should snooze this card for 30 days / 2nd time 90 / 3rd time 180 days / then forever

Bug: 15703202

Change-Id: If74101bea630246c6bda2de3ed79fee72eca4c0c

9 years agoMerge "Corrected mispelling in strings.xml" into lmp-dev
PauloftheWest [Wed, 16 Jul 2014 23:14:51 +0000 (23:14 +0000)]
Merge "Corrected mispelling in strings.xml" into lmp-dev

9 years agoCorrected mispelling in strings.xml
PauloftheWest [Wed, 16 Jul 2014 23:12:21 +0000 (16:12 -0700)]
Corrected mispelling in strings.xml

Bug: 16345771
Bug: 16337577

Change-Id: I63912c51b5483d4adbfc70668318cd14c344d244

9 years agoMerge "Only show AccountSyncSettings when we have an account" into lmp-dev
Alexandra Gherghina [Wed, 16 Jul 2014 12:29:47 +0000 (12:29 +0000)]
Merge "Only show AccountSyncSettings when we have an account" into lmp-dev

9 years agoOnly show AccountSyncSettings when we have an account
Alexandra Gherghina [Mon, 14 Jul 2014 19:09:22 +0000 (20:09 +0100)]
Only show AccountSyncSettings when we have an account

Also removes useless list of accounts

Bug: 16295803
Change-Id: Ida3c1846327874af9f97695a485b12ec689fd343

9 years agoMerge "Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to...
Fabrice Di Meglio [Wed, 16 Jul 2014 01:55:21 +0000 (01:55 +0000)]
Merge "Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash" into lmp-dev

9 years agoFix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash
Fabrice Di Meglio [Tue, 15 Jul 2014 23:02:09 +0000 (16:02 -0700)]
Fix bug #16319697 ACTION_DEVICE_INFO_SETTINGS intent causes Settings app to crash

- fix the way we are passing switchBarMarginStart / switchBarMarginEnd

Change-Id: Ic6e67643be10877a74ae68075460fa5fd4cc5da1

9 years agoFix excessively long logtag.
Jeff Davidson [Wed, 16 Jul 2014 01:51:28 +0000 (18:51 -0700)]
Fix excessively long logtag.

Change-Id: Idb0846269623550d891d8e98765d630a17da7d14

9 years agoMerge "Make crypt dialogs material" into lmp-dev
Paul Lawrence [Wed, 16 Jul 2014 21:12:16 +0000 (21:12 +0000)]
Merge "Make crypt dialogs material" into lmp-dev

9 years agoMake crypt dialogs material
Paul Lawrence [Fri, 11 Jul 2014 14:34:44 +0000 (07:34 -0700)]
Make crypt dialogs material

White on black material theme
Center text
Remove fade to black task
Fix emergency call button

Note - does not implement all requirements of frames in the defect. More
to follow.

Bug: 15328359
Change-Id: I878e59dccffff366ba2484bb77482e168cbd2b81

9 years agoMerge "Added strings for PBAP and MultiSim" into lmp-dev
PauloftheWest [Wed, 16 Jul 2014 17:40:55 +0000 (17:40 +0000)]
Merge "Added strings for PBAP and MultiSim" into lmp-dev

9 years agoAdded strings for PBAP and MultiSim
PauloftheWest [Wed, 16 Jul 2014 17:36:24 +0000 (10:36 -0700)]
Added strings for PBAP and MultiSim

Bug: 16345619
Change-Id: If7165312723316d5fd90a441562617e03023b015

9 years agoMerge "[WifiSetup] Make illustration header not clickable" into lmp-dev
Maurice Lam [Wed, 16 Jul 2014 17:07:38 +0000 (17:07 +0000)]
Merge "[WifiSetup] Make illustration header not clickable" into lmp-dev

9 years ago[WifiSetup] Make illustration header not clickable
Maurice Lam [Tue, 15 Jul 2014 23:59:48 +0000 (16:59 -0700)]
[WifiSetup] Make illustration header not clickable

No more "pop" sound when the illustration is tapped on.

Bug: 16331851
Change-Id: Ib528e1d6f669f71e0c2f24164726cee47b06700b

9 years agoMerge "Implement application-level high priority setting." into lmp-dev
Chris Wren [Tue, 15 Jul 2014 19:24:43 +0000 (19:24 +0000)]
Merge "Implement application-level high priority setting." into lmp-dev

9 years agoMerge "Changed text "NFC & More" to "More" and other minor text changes" into lmp-dev
PauloftheWest [Tue, 15 Jul 2014 14:47:49 +0000 (14:47 +0000)]
Merge "Changed text "NFC & More" to "More" and other minor text changes" into lmp-dev

9 years agoChanged text "NFC & More" to "More" and other minor text changes
PauloftheWest [Tue, 15 Jul 2014 14:36:59 +0000 (07:36 -0700)]
Changed text "NFC & More" to "More" and other minor text changes

Bug: 16298245
Change-Id: Id2bf3fc10523372a4f22d1298b57d62a2cc781cc

9 years agoNumerous additional strings needed for translation.
PauloftheWest [Tue, 15 Jul 2014 14:27:24 +0000 (07:27 -0700)]
Numerous additional strings needed for translation.

Bug: 16288110
Change-Id: I0701f90f4444700a12f68a2f44598326e94a08ec

9 years agoMerge "Adding strings for Call Manager do not merge" into lmp-dev
PauloftheWest [Tue, 15 Jul 2014 14:33:18 +0000 (14:33 +0000)]
Merge "Adding strings for Call Manager do not merge" into lmp-dev

9 years agoAdding strings for Call Manager do not merge
PauloftheWest [Mon, 14 Jul 2014 23:37:58 +0000 (16:37 -0700)]
Adding strings for Call Manager do not merge

Bug: 16300328
Change-Id: Iac23de5a8668e9f5a4e96225ab48330f10cb1499
(cherry picked from commit da43612e4b06dba0ab0abfb70c92f4b676de5186)

9 years agoNumerous additional strings needed for translation. do not merge
PauloftheWest [Mon, 14 Jul 2014 20:19:22 +0000 (13:19 -0700)]
Numerous additional strings needed for translation. do not merge

Bug: 16288110
Change-Id: I84621b00da52dcee9eb8c24e92a41ccc7f7a6bd1
(cherry picked from commit 90887e656c210f2000c844334c37741e13dc02bb)

9 years agoChanged wording from "Mobile" to "Cellular" do not merge
PauloftheWest [Mon, 14 Jul 2014 14:55:14 +0000 (07:55 -0700)]
Changed wording from "Mobile" to "Cellular" do not merge

Bug: 15720445
Change-Id: Ibfd196d80be030b694473faa24b746536daa3107
(cherry picked from commit 7325abcd6200d7e50674afb1b16677fd2a063597)

9 years agoMerge "NotificationStation: Fix crash, use dark theme" into lmp-dev
Christoph Studer [Tue, 15 Jul 2014 10:13:27 +0000 (10:13 +0000)]
Merge "NotificationStation: Fix crash, use dark theme" into lmp-dev

9 years ago(DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler to separate loops
Tadashi G. Takaoka [Mon, 14 Jul 2014 04:06:33 +0000 (13:06 +0900)]
(DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler to separate loops

Change-Id: I1b7d26c37293e03dc20f87d60eb146017a574c47
(cherry picked from commit 61d97ddda8ed09761f48fa1ed7c99b1a6caed948)

9 years ago(DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler a bit
Tadashi G. Takaoka [Mon, 14 Jul 2014 06:27:23 +0000 (15:27 +0900)]
(DO NOT MERGE) Refactor InputMethodAndSubtypeEnabler a bit

Change-Id: Id91b62ed084f98e3a6dc724aac9d926d89a96201
(cherry picked from commit a5db65fe11f862747c34f271ea416052c653300d)

9 years agoMerge "Setup Wizard string refresh" into lmp-dev
Russell Brenner [Tue, 15 Jul 2014 02:21:06 +0000 (02:21 +0000)]
Merge "Setup Wizard string refresh" into lmp-dev