OSDN Git Service
Dianne Hackborn [Mon, 28 Apr 2014 18:28:17 +0000 (18:28 +0000)]
Merge "New preference for selecting new voice interaction service."
Dianne Hackborn [Fri, 18 Apr 2014 01:35:29 +0000 (18:35 -0700)]
New preference for selecting new voice interaction service.
This is currently in addition to the existing Voice Search
preference in this UI. Eventually it will replace that one,
as a superset of its functionality.
Change-Id: I26f1220fa129870cad3ec4152a569a9c494971fb
Jeff Sharkey [Mon, 28 Apr 2014 16:39:01 +0000 (16:39 +0000)]
Merge "Disable regulatory info directly, not priority."
Jeff Sharkey [Mon, 28 Apr 2014 16:38:37 +0000 (16:38 +0000)]
Merge "Settings app usually provides regulatory info."
Jeff Sharkey [Fri, 18 Apr 2014 22:30:15 +0000 (15:30 -0700)]
Disable regulatory info directly, not priority.
Instead of using priority, offer to launch anyone handling the
action, and use the boolean to control if Settings offers the UI.
Bug:
13340779
Change-Id: Idb3f85c434414911f8911b7511b3a7a8029a8e06
Jeff Sharkey [Fri, 18 Apr 2014 00:28:31 +0000 (17:28 -0700)]
Settings app usually provides regulatory info.
It takes a higher priority to ensure that it launches over any
third-party apps, but an OEM-provided app may take a higher priority
if they need to provide details.
Bug:
13340779
Change-Id: I8e5dad1a2d0b93be74fa507c0307c87b62e634b8
John Spurlock [Mon, 28 Apr 2014 15:41:20 +0000 (11:41 -0400)]
Update zen mode settings strings.
Change-Id: I0caeed5825cedb6be16384df4988aab0ea5cdbc6
Jeff Davidson [Sat, 26 Apr 2014 18:44:35 +0000 (18:44 +0000)]
Merge "Fix NPE in AppListPreference when there is no default."
Jeff Davidson [Sat, 26 Apr 2014 15:49:59 +0000 (08:49 -0700)]
Fix NPE in AppListPreference when there is no default.
Bug:
14327074
Change-Id: I3b0dcfbefcfb91278582457beef5823072efc46a
Derek Tan [Sat, 26 Apr 2014 00:27:01 +0000 (00:27 +0000)]
Merge "Fix the crash of BandMode app."
Fabrice Di Meglio [Thu, 24 Apr 2014 21:48:48 +0000 (14:48 -0700)]
Settings new dashboard - part 2
Introduce the new Dashboard (a grid like presentation of
Settings top categories) per UX specification.
- the Dashboard is composed of "categories" and in each of them
you have "tiles"
- implement a new layout for showing top categories
(DashboardContainerView). This layout basically acts like a
grid
- depending on the device configuration make the grid with 1
column in portrait / 2 colums in landscape (phones) OR 2 columns
in portrait and 3 in landscape (tablets)
- take care of Accounts adding and removing (as it changes the
number of tiles to show)
Also remove all the old code related to Headers
Change-Id: Ie29944132c1b4c3f7b073d5a7d4453b8f5ec19a7
Derek Tan [Fri, 25 Apr 2014 23:47:54 +0000 (16:47 -0700)]
Fix the crash of BandMode app.
It crashes because of out of array boundary exception. This app
predefined a list of constant strings of band mode. Unfortunately
the actual supported band modes keep adding and the hardcoded
list can meet.
Change-Id: Ife9683924706a1606d4f72b01a5904e9aa0f782c
Dianne Hackborn [Fri, 25 Apr 2014 17:06:50 +0000 (17:06 +0000)]
Merge "Show time remaining / to charge."
Elliott Hughes [Fri, 25 Apr 2014 00:24:35 +0000 (17:24 -0700)]
resolved conflicts for merge of
f90b5141 to master
Change-Id: I666b2fcde034f6dc9f7b69409facf88a4feb5309
Elliott Hughes [Thu, 24 Apr 2014 23:59:10 +0000 (23:59 +0000)]
am
4c941850: Merge "Track MutableBoolean\'s new package."
* commit '
4c941850288011ca29466a1a80314155c0100fe3':
Track MutableBoolean's new package.
Elliott Hughes [Thu, 24 Apr 2014 23:52:13 +0000 (23:52 +0000)]
Merge "Track MutableBoolean's new package."
Dianne Hackborn [Thu, 24 Apr 2014 00:14:15 +0000 (17:14 -0700)]
Show time remaining / to charge.
Rework the battery graph to include the time remaining or
time to charge.
Change-Id: Ib26b761cb10e01f5f3aa4189db10d44b8ce62f89
Jeff Davidson [Thu, 24 Apr 2014 18:59:52 +0000 (18:59 +0000)]
Merge "Support ACTION_CHANGE_ACTIVE for network scorers."
Jeff Davidson [Thu, 17 Apr 2014 18:44:10 +0000 (11:44 -0700)]
Support ACTION_CHANGE_ACTIVE for network scorers.
Bug:
13785473
Change-Id: Ida54d4620f95c773c4c4239e9f29c1b987fd6ba2
Fabrice Di Meglio [Thu, 24 Apr 2014 17:36:53 +0000 (17:36 +0000)]
Merge "Fix bug #
14288652 Settings crash on hitting back key from Tap and Pay screen"
Fabrice Di Meglio [Thu, 24 Apr 2014 17:13:59 +0000 (10:13 -0700)]
Fix bug #
14288652 Settings crash on hitting back key from Tap and Pay screen
Gasp ... the Observer registering/unregistering code was not totally correct as
we were unregistering on a different RootAdapter.
- refactor the code for registering / unregistering the Observer
- unregister when the Fragment is stopped thru onStop().
Change-Id: I036eacd87c80fd2c9dedca705fb94a57a0c9a21d
Alexandra Gherghina [Thu, 24 Apr 2014 17:12:56 +0000 (17:12 +0000)]
Merge "Revert "Revert "Wiring for displaying managed profiles"""
Fabrice Di Meglio [Thu, 24 Apr 2014 17:08:21 +0000 (17:08 +0000)]
Merge "Settings new dashboard - part 1"
Alexandra Gherghina [Wed, 23 Apr 2014 10:56:37 +0000 (10:56 +0000)]
Revert "Revert "Wiring for displaying managed profiles""
This reverts commit
91e3f7256935f1c805878c3a5241b9e5b9a67e44.
Will wait until related commit is in to submit this.
Bug:
13756871
Change-Id: I34642998adb71f44de1e529cc214ac4f921932ed
Fabrice Di Meglio [Wed, 23 Apr 2014 23:44:30 +0000 (16:44 -0700)]
Settings new dashboard - part 1
- make the Settings dashboard definition be hierarchical (non flat) and use
categories and tiles
- code cleaning: remove mHeaderIndexMap
Change-Id: I16581a736ac5c8388a182d83159161fe3bb04f4b
Jeff Davidson [Thu, 24 Apr 2014 16:49:19 +0000 (16:49 +0000)]
Merge "Refactor SmsListPreference into AppListPreference."
Baligh Uddin [Thu, 24 Apr 2014 14:30:47 +0000 (14:30 +0000)]
Merge "Import translations. DO NOT MERGE"
Elliott Hughes [Thu, 24 Apr 2014 01:04:40 +0000 (18:04 -0700)]
Track MutableBoolean's new package.
Change-Id: I96df3fcbc3b94186a36617dfc1df5b195880be13
Baligh Uddin [Wed, 23 Apr 2014 21:28:42 +0000 (14:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief4b4cbe513c64abe5b431c36f2aa79ced9c3bc1
Auto-generated-cl: translation import
Fabrice Di Meglio [Wed, 23 Apr 2014 17:35:51 +0000 (17:35 +0000)]
Merge "Add saved Search queries feature"
Fabrice Di Meglio [Wed, 23 Apr 2014 00:23:23 +0000 (17:23 -0700)]
Add saved Search queries feature
- update SearchResultsSummary fragment to have two lists:
one for Search suggestions (saved queries) and one for
Search results
- a tap on a saved query will launch that Search query
- show the list of saved queries when tapping on the SearchView
- do some fancy hidding / unhidding of the saved queries list
and results list
Change-Id: If15055ab78b0ec5eef4e543173dc7b866bd08e27
John Spurlock [Wed, 23 Apr 2014 15:37:27 +0000 (11:37 -0400)]
Notification settings: update lockscreen option language.
When device is locked:
- Show all notification content
- Hide sensitive notification content
Change-Id: I641bca5f1b5f0ab1b2dc381fc0af7f32a9f2bc6d
Alexandra Gherghina [Wed, 23 Apr 2014 10:55:51 +0000 (10:55 +0000)]
Merge "Revert "Wiring for displaying managed profiles""
Alexandra Gherghina [Wed, 23 Apr 2014 10:51:53 +0000 (10:51 +0000)]
Revert "Wiring for displaying managed profiles"
This reverts commit
a044235272d5319ed3b1dd1aebc051b88ec69c1a.
This depended on CL: https://googleplex-android-review.googlesource.com/#/q/I2907b182e19b3562592da688b3f68ef5f4088557 which was not commited yet.
Bug:
13756871
Change-Id: Ib05c58002a06c7882c4b6dfd750c9681ff4b1646
Alexandra Gherghina [Wed, 23 Apr 2014 07:04:32 +0000 (07:04 +0000)]
Merge "Wiring for displaying managed profiles"
Baligh Uddin [Wed, 23 Apr 2014 02:20:43 +0000 (02:20 +0000)]
am
293b1fc0: (-s ours) am
06172af6: (-s ours) Import translations. DO NOT MERGE
* commit '
293b1fc04dbcdecab4c2a9b4a718b01264612fbb':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 02:13:34 +0000 (02:13 +0000)]
am
06172af6: (-s ours) Import translations. DO NOT MERGE
* commit '
06172af69451678f5d1dd388a372ab00b58d682f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Apr 2014 00:59:15 +0000 (17:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9185da8de4b0c0818b926377543992356f265dd9
Auto-generated-cl: translation import
Ruchi Kandoi [Fri, 18 Apr 2014 00:54:35 +0000 (17:54 -0700)]
Setting: Developer Option: Adds a low power mode checkbox
Change-Id: I489f74bd3822f64acb8becd6e5eda716d8bd722c
Signed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
Amith Yamasani [Tue, 22 Apr 2014 19:20:15 +0000 (19:20 +0000)]
Merge "Temporary color change to make lock pattern screen visible"
Christopher Tate [Tue, 22 Apr 2014 18:31:33 +0000 (18:31 +0000)]
am
a8351581: am
442f01c6: am
95228074: am
c44d7c6b: Prohibit uninstall of the default (or only) home app
* commit '
a83515813cb5664fd68f583caa6d0bc6b6bc0042':
Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 18:09:27 +0000 (18:09 +0000)]
am
442f01c6: am
95228074: am
c44d7c6b: Prohibit uninstall of the default (or only) home app
* commit '
442f01c6018f2fddb413a730b54d2eae542b1078':
Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 18:05:39 +0000 (18:05 +0000)]
am
95228074: am
c44d7c6b: Prohibit uninstall of the default (or only) home app
* commit '
95228074d2e01575799a526a29ec53a61c36aa23':
Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 17:58:59 +0000 (17:58 +0000)]
am
c44d7c6b: Prohibit uninstall of the default (or only) home app
* commit '
c44d7c6be64be790878ddf1f21c0d9e91d238245':
Prohibit uninstall of the default (or only) home app
Christopher Tate [Tue, 22 Apr 2014 17:17:21 +0000 (10:17 -0700)]
Prohibit uninstall of the default (or only) home app
We suppress the ability to uninstall (including uninstall of updates to
system-bundled apps) when the package in question is either the only
installed home app, or has been explicitly tagged by the user as the
"every time" home app among all those installed.
Bug
14162565
Change-Id: I582bb0d2abf0911ac68813f4c7e6fd7d17bfc2ca
Amith Yamasani [Tue, 22 Apr 2014 16:22:40 +0000 (09:22 -0700)]
Temporary color change to make lock pattern screen visible
Fixes the white on white in Settings when creating or confirming
a lock pattern.
Change-Id: Ie4770edbabb76b984e17b84f8f1e7c991bb2316b
John Spurlock [Tue, 22 Apr 2014 15:04:06 +0000 (15:04 +0000)]
Merge "Do not disturb settings page."
Baligh Uddin [Tue, 22 Apr 2014 14:51:46 +0000 (14:51 +0000)]
Merge "Import translations. DO NOT MERGE"
John Spurlock [Sun, 20 Apr 2014 20:19:53 +0000 (16:19 -0400)]
Do not disturb settings page.
General section:
Create switches for Phone calls & Messages. Contact
filtering disabled for now.
Automatic section:
Add mode switching based on a simple overnight schedule.
Bug:
14211946
Change-Id: Ibb4e916cd5c9970f483858db91d6165507ceeb1a
Fabrice Di Meglio [Tue, 22 Apr 2014 01:38:47 +0000 (01:38 +0000)]
Merge "Save Search queries"
Fabrice Di Meglio [Tue, 22 Apr 2014 00:07:28 +0000 (17:07 -0700)]
Save Search queries
- update database model for adding a table for saving a query
and its timestamp
- update database version
- save the query when the User tap on a Search result
- remove old queries (no more than 5 are saved)
Change-Id: I4ddff0ad660944c7fd53be64ac95397850dc60d0
Fabrice Di Meglio [Mon, 21 Apr 2014 23:41:13 +0000 (23:41 +0000)]
Merge "Fix missing summary for CheckBoxPreference"
Fabrice Di Meglio [Mon, 21 Apr 2014 23:37:39 +0000 (16:37 -0700)]
Fix missing summary for CheckBoxPreference
- "summaryOn" and "summaryOff" were parsed but we were missing
also "summary"
Repro case: search for "adt" (from Developer options)
Change-Id: Ifa829ec6c6f86cb426432f716c2d28df8550f9ea
Fabrice Di Meglio [Mon, 21 Apr 2014 23:00:22 +0000 (23:00 +0000)]
Merge "Rename SettingsUtils to PrintSettingsUtils"
Fabrice Di Meglio [Mon, 21 Apr 2014 22:58:41 +0000 (15:58 -0700)]
Rename SettingsUtils to PrintSettingsUtils
Change-Id: I67e9222265f6326b399de3779f2210e202777ecd
Fabrice Di Meglio [Mon, 21 Apr 2014 22:35:05 +0000 (22:35 +0000)]
Merge "Fix bug #
14228591 NPE in settings app when it is launched by UiAutomator"
Fabrice Di Meglio [Mon, 21 Apr 2014 22:32:28 +0000 (15:32 -0700)]
Fix bug #
14228591 NPE in settings app when it is launched by UiAutomator
- test for null references
Change-Id: Iff6efc92cc16ada9f6e8f057ba9c23a241e62000
Baligh Uddin [Mon, 21 Apr 2014 20:50:52 +0000 (13:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I04673ea4fce055c657b8b36ba765b74747495748
Auto-generated-cl: translation import
Fabrice Di Meglio [Mon, 21 Apr 2014 20:48:47 +0000 (20:48 +0000)]
Merge "Code cleaning"
Fabrice Di Meglio [Mon, 21 Apr 2014 20:46:39 +0000 (13:46 -0700)]
Code cleaning
- remove duplicate semicolon
Change-Id: I807ce89dfa6b46c415a95a9c6cdc71fd3e9a2502
Fabrice Di Meglio [Mon, 21 Apr 2014 20:29:12 +0000 (20:29 +0000)]
Merge "Enable Search result highlight for Accessibility and IME settings"
Fabrice Di Meglio [Mon, 21 Apr 2014 20:27:23 +0000 (13:27 -0700)]
Enable Search result highlight for Accessibility and IME settings
- add missing keys
- update Database version to force re-indexing (because the keys
were missing)
Change-Id: I7533d86b0f9d79d838e5c16d4bc51b7b09dffae5
Fabrice Di Meglio [Mon, 21 Apr 2014 19:46:39 +0000 (19:46 +0000)]
Merge "Fix bug #
14158603 Stability: NPE in Settings: Attempt to invoke... ...interface method 'boolean android.view.MenuItem.collapseActionView()' ...on a null object reference"
Fabrice Di Meglio [Mon, 21 Apr 2014 19:43:20 +0000 (12:43 -0700)]
Fix bug #
14158603 Stability: NPE in Settings: Attempt to invoke...
...interface method 'boolean android.view.MenuItem.collapseActionView()'
...on a null object reference
- fix cases where mSearchMenuItem or mSearchView could be null
Change-Id: I2b0256fe2c8c1b426d4e0799881dd2f13480a00a
Fabrice Di Meglio [Mon, 21 Apr 2014 18:49:43 +0000 (18:49 +0000)]
Merge "Fix NPE java.lang.IllegalStateException: Observer com.android.settings.SettingsPreferenceFragment$1@
373ee1aa is already registered."
Fabrice Di Meglio [Mon, 21 Apr 2014 18:40:21 +0000 (11:40 -0700)]
Fix NPE java.lang.IllegalStateException: Observer com.android.settings.SettingsPreferenceFragment$1@
373ee1aa is already registered.
- propertly register / unregister the DataSetObserver
Change-Id: I04de3c7ec14e71591edc174ebafabe9a1fb165c2
Fabrice Di Meglio [Mon, 21 Apr 2014 18:33:42 +0000 (18:33 +0000)]
Merge "Better decoupling of Index updates in Bluetooth Settings"
Fabrice Di Meglio [Mon, 21 Apr 2014 18:32:39 +0000 (11:32 -0700)]
Better decoupling of Index updates in Bluetooth Settings
- use a Handler
- force rebuilding
Change-Id: I474fa98ea0e0758abcc46d4812f744dff24fd455
Fabrice Di Meglio [Mon, 21 Apr 2014 18:24:42 +0000 (18:24 +0000)]
Merge "Force Search Index rebuilding for Wifi remembered networks"
Fabrice Di Meglio [Mon, 21 Apr 2014 18:24:33 +0000 (11:24 -0700)]
Force Search Index rebuilding for Wifi remembered networks
... when the WiFi swich will be toggled on/off
Change-Id: Iea93819e4c473aafc6aaedf6abb723969dbc9e52
Fabrice Di Meglio [Mon, 21 Apr 2014 18:12:41 +0000 (18:12 +0000)]
Merge "Better decoupling of Index updates in WiFi Settings"
Fabrice Di Meglio [Mon, 21 Apr 2014 17:57:07 +0000 (10:57 -0700)]
Better decoupling of Index updates in WiFi Settings
- use a Handler
Change-Id: I1e35f2e437021001900468d0df2b75e53b8c62f6
Fabrice Di Meglio [Mon, 21 Apr 2014 17:52:55 +0000 (17:52 +0000)]
Merge "Remove non needed code for HeaderAdapter"
Fabrice Di Meglio [Mon, 21 Apr 2014 17:52:34 +0000 (10:52 -0700)]
Remove non needed code for HeaderAdapter
- before, we were showing a Swich for WiFi and Bluetooth entries
in the Headers. As this is no more the case, remove the code
that is no more usefull.
- as a side effect, we are also removing the call to update the
Search Index that was running when the Settings app was resuming
or pausing.
Change-Id: I26b40df5c7a664d196a249840638d89909b6bc24
Fabrice Di Meglio [Mon, 21 Apr 2014 17:15:51 +0000 (17:15 +0000)]
Merge "Search - optimize when updating the Index is done - part 2"
Fabrice Di Meglio [Mon, 21 Apr 2014 17:14:28 +0000 (10:14 -0700)]
Search - optimize when updating the Index is done - part 2
- well, fix a regression when launching WiFi / Bluetooth settings
from the Quick Settings: we can only get the Intent properties
after the call to super.onCreate(...)
Change-Id: I21abbee610ad53dd0022c645268e55a6ba31a7b0
Fabrice Di Meglio [Mon, 21 Apr 2014 16:43:21 +0000 (16:43 +0000)]
Merge "Search - optimize when updating the Index is done"
Fabrice Di Meglio [Mon, 21 Apr 2014 16:40:46 +0000 (09:40 -0700)]
Search - optimize when updating the Index is done
- we should only try to update the index when the Settings app is launched
Change-Id: I0543d518ea3e06804ce6fb09c987ea722bcc87cd
Fabrice Di Meglio [Mon, 21 Apr 2014 16:33:05 +0000 (16:33 +0000)]
Merge "Make highlithing delay consistent"
Fabrice Di Meglio [Mon, 21 Apr 2014 16:31:36 +0000 (09:31 -0700)]
Make highlithing delay consistent
- set it to 400ms for HighlightingFragment as it was also 400ms
for SettingsPreferenceFragment
Change-Id: I52b910246ee557c98565dacd2bbcf57a812ea7eb
Fabrice Di Meglio [Mon, 21 Apr 2014 16:30:06 +0000 (16:30 +0000)]
Merge "Enable highlighting of Print services"
Fabrice Di Meglio [Sat, 19 Apr 2014 02:40:40 +0000 (19:40 -0700)]
Enable highlighting of Print services
- add to SettingsPreferenceFragment to know when the associated
RootAdapter is changing and thus being able to find the highlighted
Preference
- also, add the correct Search key during indexing. She should
match the one created when adding dynamically the Preference
- last, increase to 400ms the delay to do the highlight
Change-Id: I3a1a81fdf5c8ab5f3aaab29f16ea9879ab6df056
John Spurlock [Tue, 8 Apr 2014 18:08:21 +0000 (14:08 -0400)]
App-level notification configuration settings page.
New sub-page off of notification settings to ban/unban
apps and navigate to an app's notification configuration
activity (if configured).
Centralized all notification settings artifacts under a new
settings subpackage.
Bug:
13935172
Change-Id: I53b75c02f0091900734d17dc9217035d0df9b466
Fabrice Di Meglio [Sat, 19 Apr 2014 00:14:39 +0000 (17:14 -0700)]
Fix Print title name in search results
- use R.string.print_settings
Change-Id: I3a945aed9efbc323e865db1cdbcfd8ceeb6b2558
Fabrice Di Meglio [Fri, 18 Apr 2014 23:38:26 +0000 (16:38 -0700)]
Make all the Settings Switches appear again
- use the ActionBar Theme context when creating the Switch for
getting the correct Theming
Change-Id: Ic3701c53662b0f245c7149b119de8bb5cbaae232
Fabrice Di Meglio [Fri, 18 Apr 2014 23:18:26 +0000 (16:18 -0700)]
Make the WiFi switch appear again
- use the ActionBar Theme context when creating the Switch for
getting the correct Theming
Change-Id: I1c44e1b1c28bf02af4c2ac9912295106d93a60e8
Fabrice Di Meglio [Fri, 18 Apr 2014 22:18:40 +0000 (15:18 -0700)]
Code cleaning
- use constants where needed for the tag/key
- remove wrong tag
Change-Id: I32578ce6a3a604dc0ea7168206a5d84391e2cce7
Fabrice Di Meglio [Fri, 18 Apr 2014 20:46:53 +0000 (20:46 +0000)]
Merge "Improve Preference highlighting"
Fabrice Di Meglio [Fri, 18 Apr 2014 00:20:27 +0000 (17:20 -0700)]
Improve Preference highlighting
- use PreferenceFragment.onBindPreferences() to launch highlighting
- improve SettingsPreferenceFragment code for highlighting: now we can
find the View to highlight thru its Tag if there is no ListAdapter available
- add HighlightingFragment for highlighting a View from its tag/key. This
is dealing with cases when the content is custom and not relying on
SettingsPreferenceFragment (like DataUsageSummary)
Also:
- improve DataUsageSummary so that onResume() is not recreating the
Tabs all the time
- add missing "android:keys" on some Security Settings preference files
Change-Id: Ib1dd8238fe2fb57c151d584c0810a0e0a5ad97c4
Baligh Uddin [Thu, 17 Apr 2014 19:36:22 +0000 (19:36 +0000)]
am
89e96c30: (-s ours) am
54b5982f: (-s ours) Import translations. DO NOT MERGE
* commit '
89e96c308cf67e492b699363d90b58516ea3bf54':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 16:23:22 +0000 (16:23 +0000)]
am
54b5982f: (-s ours) Import translations. DO NOT MERGE
* commit '
54b5982f148290a00fa2ff38e7e30d487cf69998':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 17 Apr 2014 16:19:19 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE"
Adrian Roos [Thu, 17 Apr 2014 12:32:06 +0000 (14:32 +0200)]
Remove the lockscreen widget setting
Bug:
14087729
Change-Id: Ia276411f7622fe1211528ab779a7099bb20800d4
Fabrice Di Meglio [Thu, 17 Apr 2014 01:26:47 +0000 (01:26 +0000)]
Merge "Fix potential NPE with Preference highlighting"
Fabrice Di Meglio [Thu, 17 Apr 2014 01:26:19 +0000 (18:26 -0700)]
Fix potential NPE with Preference highlighting
- there are some cases where the ListView adapter is null
Change-Id: I9dcd171f57d9ca7b8032d890f5a18c3a01fd38cf
Fabrice Di Meglio [Thu, 17 Apr 2014 01:19:12 +0000 (01:19 +0000)]
Merge "Improve Preference highlight effect"
Fabrice Di Meglio [Thu, 17 Apr 2014 01:01:38 +0000 (18:01 -0700)]
Improve Preference highlight effect
- restrict the effect to the Preference View itself
Change-Id: I3ab04433e1acecb906d0a458b31314f97b9bda03
Fabrice Di Meglio [Thu, 17 Apr 2014 00:26:11 +0000 (00:26 +0000)]
Merge "Update Search icon"
Fabrice Di Meglio [Thu, 17 Apr 2014 00:25:17 +0000 (17:25 -0700)]
Update Search icon
- use Quantum Theme one
See bug #
13818985 Settings using GB-style search icon
Change-Id: I0b0f61524f1e66bfdb46c47798e9ec1f5038c10c
Baligh Uddin [Thu, 17 Apr 2014 00:22:10 +0000 (17:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b956a8b327e77eecc76e3df141ad6b1750433a3
Auto-generated-cl: translation import