OSDN Git Service
Paul Lawrence [Mon, 2 Jun 2014 15:07:29 +0000 (08:07 -0700)]
Adding comment
To enable marquee'ing, you have to call setSelected on the relevant control.
Comment added to explain this. Also see defect
15327172 filed against
SDK documentation to properly explain this.
Change-Id: If8f70baa1b682070b312fa689b2edd77b50d2d6e
Paul Lawrence [Mon, 2 Jun 2014 14:47:20 +0000 (14:47 +0000)]
Merge "Disable orientation switching on CryptKeeper screen"
Russell Brenner [Mon, 2 Jun 2014 04:33:42 +0000 (04:33 +0000)]
Merge "Refactor setup wizard-related code"
Fabrice Di Meglio [Sat, 31 May 2014 01:56:10 +0000 (01:56 +0000)]
am
23c6666a: (-s ours) Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE
* commit '
23c6666a88294acc5a43993cd305a8700b34d03e':
Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE
Fabrice Di Meglio [Sat, 31 May 2014 00:59:00 +0000 (17:59 -0700)]
Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE
Manual report of
0897f975c12808794deb0f4b81ed0bbc89d2279a
- clean some imports
- add key and title to security_settings_picker.xml
- add ChooseLockGenericFragment in SearchIndexableResources
Change-Id: I3ab77677f3d926b0a3eb9be5d77ee23b568856aa
Fabrice Di Meglio [Fri, 30 May 2014 23:53:34 +0000 (16:53 -0700)]
Fix the build
- somewhat LMP Previe and Master has diverged
- fix the missing symbol
- add the missing ChooseLockGeneric.ChooseLockGenericFragment in the
ranking Map
Change-Id: Ib978763b5bb093d8192749604a62bb15f6904289
Russell Brenner [Fri, 23 May 2014 20:03:15 +0000 (13:03 -0700)]
Refactor setup wizard-related code
Extracted setup-related code from WifiSettings, putting it into a new
derived class, WifiSettingsForSetupWizard.
Set taskAffinity to com.android.wizard, for alignment with other
setup wizard-related tasks.
Change-Id: If371f219dac5d3eff8f7899c16cc6f9475be47cf
John Spurlock [Fri, 30 May 2014 23:13:16 +0000 (23:13 +0000)]
am
a391d9c6: Merge "ZenSettings: Only show "next day" if start >= end time." into lmp-preview-dev
* commit '
a391d9c6acdd76a50ce7b2982bca15e569bc97e0':
ZenSettings: Only show "next day" if start >= end time.
John Spurlock [Fri, 30 May 2014 23:08:13 +0000 (23:08 +0000)]
Merge "ZenSettings: Only show "next day" if start >= end time." into lmp-preview-dev
John Spurlock [Fri, 30 May 2014 23:04:53 +0000 (19:04 -0400)]
ZenSettings: Only show "next day" if start >= end time.
Bug:
15345316
Change-Id: Ic1130dc639f63ae6026f7c7ba2a0ad9402557ce7
Fabrice Di Meglio [Fri, 30 May 2014 22:39:53 +0000 (22:39 +0000)]
am
2aa32299: Merge "Fix bug #
15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app" into lmp-preview-dev
* commit '
2aa322991da364b9be74a6e13a4de314765eadd1':
Fix bug #
15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app
Fabrice Di Meglio [Fri, 30 May 2014 22:36:05 +0000 (22:36 +0000)]
Merge "Fix bug #
15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app" into lmp-preview-dev
Fabrice Di Meglio [Fri, 30 May 2014 22:30:12 +0000 (15:30 -0700)]
Fix bug #
15335840 "Safety information" search suggestion shown though
..."Safety information" setting is not available in settings app
- implement a SearchIndexProvider for DeviceInfoSettings and
remove some Preference indexing depending on the device state
and configuration
- remove old non used Preferences
- some code cleaning
Change-Id: I3b2c9dc7cb9f1137b553fed9330aeea4020bd2f8
Chris Wren [Fri, 30 May 2014 21:43:43 +0000 (21:43 +0000)]
am
d711b221: Merge "Support audience filtering in the Zen Mode settings." into lmp-preview-dev
* commit '
d711b22130cbe97c63b8f7475720c1b5098f38ed':
Support audience filtering in the Zen Mode settings.
Chris Wren [Fri, 30 May 2014 21:37:55 +0000 (21:37 +0000)]
Merge "Support audience filtering in the Zen Mode settings." into lmp-preview-dev
Fabrice Di Meglio [Fri, 30 May 2014 21:33:47 +0000 (21:33 +0000)]
am
2bc41e29: Merge "Fix bug #
15342475 Settings search ranking improvement" into lmp-preview-dev
* commit '
2bc41e29b99961cbb3d879b1b45e4b14d8a5f3e1':
Fix bug #
15342475 Settings search ranking improvement
Santos Cordon [Fri, 30 May 2014 21:32:50 +0000 (21:32 +0000)]
am
3afbdf00: Update showCallScreen to use Telecomm (6/6)
* commit '
3afbdf006057c93f930694e26306a3cc9cea34e4':
Update showCallScreen to use Telecomm (6/6)
Fabrice Di Meglio [Fri, 30 May 2014 21:09:16 +0000 (21:09 +0000)]
Merge "Fix bug #
15342475 Settings search ranking improvement" into lmp-preview-dev
Fabrice Di Meglio [Fri, 30 May 2014 20:44:08 +0000 (13:44 -0700)]
Fix bug #
15342475 Settings search ranking improvement
- introduce the "base rank" concept. All SearchIndexablesProvider
will have a base rank and the Settings one will get a "0" base rank.
- use a map whose key is the authority name for the provider to get
and store the base rank
- if a base rank is not defined, use the current max defined one and
increment it to define the new one.
Then we will compute the real rank this way:
rank = (providerRank > 0) ? baseRank + providerRank : baseRank
Change-Id: Ifa82bfcdfc07f25c4a5f304f47550686f7d4c13d
Chris Wren [Wed, 28 May 2014 19:11:19 +0000 (15:11 -0400)]
Support audience filtering in the Zen Mode settings.
Depends-On: I7c91dec1afeb54505426c4da59ec4d072a60c240
Change-Id: Idf5523e225c1368a43bf46338490c69ed9dffd09
Paul Lawrence [Fri, 30 May 2014 14:45:44 +0000 (14:45 +0000)]
Merge "Fix marqueeing of OwnerText on CryptKeeper screens"
Santos Cordon [Fri, 30 May 2014 04:48:16 +0000 (21:48 -0700)]
Update showCallScreen to use Telecomm (6/6)
Use TelephonyManager instead of ITelephony for showCallScreen so that
the invocation routed to telecomm instead.
Bug:
15008165
Change-Id: Ib674e2e48efaa1cc97d1513dc2c2b27fdb343657
Fabrice Di Meglio [Fri, 30 May 2014 02:48:13 +0000 (02:48 +0000)]
am
d4757e08: Merge "Fix bug #
15330860 “More...” item in Settings should not have an icon" into lmp-preview-dev
* commit '
d4757e088b2f034e76b72840ccdb3fc5cd5f88c6':
Fix bug #
15330860 “More...” item in Settings should not have an icon
Fabrice Di Meglio [Fri, 30 May 2014 02:43:29 +0000 (02:43 +0000)]
Merge "Fix bug #
15330860 “More...” item in Settings should not have an icon" into lmp-preview-dev
Fabrice Di Meglio [Fri, 30 May 2014 02:19:52 +0000 (19:19 -0700)]
Fix bug #
15330860 “More...” item in Settings should not have an icon
- update the string to say "NFC & more"
Change-Id: Ic61e4a85cc6dfd6f32443656d9fb3ef5f9577a6e
Fabrice Di Meglio [Fri, 30 May 2014 01:28:03 +0000 (01:28 +0000)]
am
c9a972ab: Merge "Fix bug #
15330860 “More...” item in Settings should not have an icon" into lmp-preview-dev
* commit '
c9a972ab2a14b899412c8993f166dc70b8bcc955':
Fix bug #
15330860 “More...” item in Settings should not have an icon
Fabrice Di Meglio [Fri, 30 May 2014 01:23:10 +0000 (01:23 +0000)]
Merge "Fix bug #
15330860 “More...” item in Settings should not have an icon" into lmp-preview-dev
Fabrice Di Meglio [Fri, 30 May 2014 01:21:37 +0000 (18:21 -0700)]
Fix bug #
15330860 “More...” item in Settings should not have an icon
- actually the issue is that the string was containing an ellipsis
so remove it
Change-Id: I37f7db91fd86ba93d533d2a78c75813d2adbbc7e
Fabrice Di Meglio [Fri, 30 May 2014 00:51:41 +0000 (00:51 +0000)]
am
bc16c5dd: Merge "Update ActionBar for using contentInsetStart" into lmp-preview-dev
* commit '
bc16c5ddac0aab9f4bf69913ca2b8877e9a7daf6':
Update ActionBar for using contentInsetStart
Fabrice Di Meglio [Fri, 30 May 2014 00:47:42 +0000 (00:47 +0000)]
Merge "Update ActionBar for using contentInsetStart" into lmp-preview-dev
Fabrice Di Meglio [Thu, 29 May 2014 03:08:55 +0000 (20:08 -0700)]
Update ActionBar for using contentInsetStart
- also align SwitchBar ON/OFF text
See bug: #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: Ie8224be169ac975b5f71ca23f0c87f385554878e
John Reck [Thu, 29 May 2014 18:06:13 +0000 (18:06 +0000)]
am
84f2d7ee: Merge "Remove unsupported visual_lines" into lmp-preview-dev
* commit '
84f2d7ee4cf6b1d4258b35ce23b57ac145c951ae':
Remove unsupported visual_lines
John Reck [Thu, 29 May 2014 18:01:41 +0000 (18:01 +0000)]
Merge "Remove unsupported visual_lines" into lmp-preview-dev
Ido Ofir [Thu, 29 May 2014 17:29:18 +0000 (17:29 +0000)]
Merge "Moving the trust agents settings in the security settings menu and adding personal unlock."
Paul Lawrence [Thu, 29 May 2014 17:19:08 +0000 (10:19 -0700)]
Fix marqueeing of OwnerText on CryptKeeper screens
Have to call setSelected to make marqueeing work.
Change-Id: Ic00012c150a9cacfff2b11f2938ea0674a1f45e9
John Reck [Thu, 29 May 2014 17:16:33 +0000 (10:16 -0700)]
Remove unsupported visual_lines
Change-Id: I710ad2d3f121203f64ea8246a1a85662b335b9e3
Alexandra Gherghina [Thu, 29 May 2014 16:29:43 +0000 (16:29 +0000)]
Merge "Adds missing accessibility string for accounts syncing"
Paul Lawrence [Fri, 23 May 2014 15:46:34 +0000 (08:46 -0700)]
Disable orientation switching on CryptKeeper screen
Consensus is that it adds no usability, but creates bugs and unpleasantness.
@bug
14415329
Change-Id: Icd682e5199d0d7b5d2f25b6e772e6e3cdb3a9bb0
Fabrice Di Meglio [Wed, 28 May 2014 23:23:14 +0000 (23:23 +0000)]
Merge "FR #
15314612 - Enable search on non accentuated chars"
Fabrice Di Meglio [Wed, 28 May 2014 23:22:54 +0000 (23:22 +0000)]
Merge "Search - prepare for better normalization"
Fabrice Di Meglio [Wed, 28 May 2014 23:17:24 +0000 (16:17 -0700)]
FR #
15314612 - Enable search on non accentuated chars
- update normalization step. Use a Normalizer for a string
decomposition to the NFD form and remove those diacritics with
a "\\p{InCombiningDiacriticalMarks}+" pattern.
See bug #
15314612 Search - need to be able to search and have results
with non accentuated chars
Change-Id: Ifaf4cd2ca2fb712e1c6f5f5272f942dda99464e4
Brian Carlstrom [Wed, 28 May 2014 23:18:47 +0000 (23:18 +0000)]
am
f3542909: am
2ce0dcda: am
70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
f354290901284fdf147e200c814d34207927d04e':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 23:13:26 +0000 (23:13 +0000)]
am
2ce0dcda: am
70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
2ce0dcdad47e132dbe0f9cd16146b8e3c6b11cd6':
Move to dalvik.vm.lib.2 to force default to libart
Fabrice Di Meglio [Wed, 28 May 2014 22:56:30 +0000 (15:56 -0700)]
Search - prepare for better normalization
- code refactoring
See bug: #
15314612 Search - need to be able to search and have results
with non accentuated chars
Change-Id: Ic3eb94c0effccf6592c02b3eaa78bf26a2d09714
Brian Carlstrom [Wed, 28 May 2014 22:31:43 +0000 (22:31 +0000)]
am
70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '
70f2201c7ab842df6c45a1540803239eafa267ed':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 22:28:47 +0000 (22:28 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart"
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
(cherry picked from commit
3bc8aaad298c98eccff2060667b35fa1505f84e7)
Change-Id: I5c551d6d6f00af5a7b3638e3847950e441414e37
Brian Carlstrom [Wed, 28 May 2014 21:44:57 +0000 (21:44 +0000)]
am
238be024: Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev
* commit '
238be024d702c7a6bd702ce17617fd2a20fc1cc0':
Move to dalvik.vm.lib.2 to force default to libart
Brian Carlstrom [Wed, 28 May 2014 21:39:35 +0000 (21:39 +0000)]
Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev
Brian Carlstrom [Wed, 28 May 2014 21:31:47 +0000 (14:31 -0700)]
Move to dalvik.vm.lib.2 to force default to libart
Bug:
14298175
Change-Id: I5ebd13eebf42c998418ef79381d9c8b89aaf5c0c
John Spurlock [Wed, 28 May 2014 20:52:56 +0000 (20:52 +0000)]
am
4e4cdeff: Settings: Remove sound settings.
* commit '
4e4cdeffdb6087c953f44808f14f18554a749bda':
Settings: Remove sound settings.
John Spurlock [Wed, 28 May 2014 13:43:45 +0000 (09:43 -0400)]
Settings: Remove sound settings.
- Move the remaining conditional preferences into
the combined Sound & Notifications screen.
- Refactor the "Other sounds" sub-settings screen to
provide a home for the new preferences.
- Migrate docking sounds, conditional on config.
- Migrate docking media, conditional on config.
- Migrate emergency tones, conditional on CDMA.
- Move all boilerplate preference <-> setting plumbing into
a separate helper.
- Since some preferences in Other sounds are now conditional,
create a special indexer for searching.
- Remove SoundSettings (and xml), create aliases in the manifest
to avoid breaking shortcuts.
Bug:
15279526
Change-Id: I5ae3ecda2f899b1948f7908bd217a799326c2c56
Ido Ofir [Fri, 9 May 2014 21:47:15 +0000 (14:47 -0700)]
Moving the trust agents settings in the security settings menu and adding
personal unlock.
Change-Id: I0eeb3a32c55450af2435112a98aa44475159dc4f
Geoff Mendal [Wed, 28 May 2014 20:27:36 +0000 (20:27 +0000)]
Merge "Probably broke the build."
Geoff Mendal [Wed, 28 May 2014 20:23:44 +0000 (20:23 +0000)]
Probably broke the build.
Revert "Import translations. DO NOT MERGE"
This reverts commit
bea433fb6f8091db488aaec2a69c5c1a3212a4da.
Change-Id: Ib756f35d49e16ec23e48077b1c5b63a924b0c48f
Geoff Mendal [Wed, 28 May 2014 20:02:00 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 28 May 2014 19:44:19 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2b4d4df1a1953d6b4f1672c4d5b1ea6c0a35bb77
Auto-generated-cl: translation import
Fabrice Di Meglio [Wed, 28 May 2014 18:43:13 +0000 (11:43 -0700)]
Fix bug #
15170508 When I initially load settings, all on/off toggles
...start in off position then move to on after pane loads
Another look at this issue.
- start the Switch as View.GONE and make it View.VISIBLE when
the Wi-Fi state is defined.
Change-Id: I2f3077f779fc4030b2ba9ff3b21be8148add33c3
Fabrice Di Meglio [Wed, 28 May 2014 17:37:39 +0000 (17:37 +0000)]
Merge "This CL is not working (even after careful testing) but when I tried I was not completely ToT. "
Fabrice Di Meglio [Wed, 28 May 2014 17:36:21 +0000 (17:36 +0000)]
This CL is not working (even after careful testing) but when I tried I was not completely ToT.
Revert "Fix bug #
15170508 When I initially load settings, all on/off toggles start in off position then move to on after pane loads"
This reverts commit
1e52db8063a0be2254097b4d85527a91d141b505.
Change-Id: I73bdfeba4a4b3e993e37cdae1e3733ffe272b9eb
Przemyslaw Szczepaniak [Wed, 28 May 2014 16:17:36 +0000 (16:17 +0000)]
Merge "Make TTS "Listen to an example" survive rotation."
Przemyslaw Szczepaniak [Wed, 28 May 2014 10:57:07 +0000 (11:57 +0100)]
Make TTS "Listen to an example" survive rotation.
Bug:
15019145
Change-Id: Id94e32947c58911ded3e4025653b415453cabbbb
Alexandra Gherghina [Wed, 28 May 2014 14:47:25 +0000 (15:47 +0100)]
Adds missing accessibility string for accounts syncing
Change-Id: If84fd05c67d2bddfbbc197a6f961c10409744462
Fabrice Di Meglio [Wed, 28 May 2014 02:18:34 +0000 (02:18 +0000)]
Merge "Fix bug #
15170508 When I initially load settings, all on/off toggles start in off position then move to on after pane loads"
Fabrice Di Meglio [Tue, 27 May 2014 23:43:40 +0000 (16:43 -0700)]
Fix bug #
15170508 When I initially load settings, all on/off toggles start in off position then move to on after pane loads
- refactor all the code that was using the Switch to control it thru the SwitchBar
- start the Switch as View.GONE and make it View.VISIBLE when it is set
as "enabled" or "checked" so that you dont see the Switch transition (it shows
only with it final state)
Change-Id: I382076bf3c819c530b5b2c06ca2429dfb2cdc6bf
Dave Langemak [Tue, 27 May 2014 22:24:16 +0000 (22:24 +0000)]
am
9e8bd809: Merge "Move mobile data dis/enable to Telephony" into lmp-preview-dev
* commit '
9e8bd809fca7c5fccc02bb5671c78e60906bd12a':
Move mobile data dis/enable to Telephony
Fabrice Di Meglio [Tue, 27 May 2014 22:24:08 +0000 (22:24 +0000)]
am
9c3c57f7: (-s ours) DO NOT MERGE: Fix bug #
15161058 Stability: ISE in Settings:Fragment DashboardSummary{
588de71} not attached to Activity
* commit '
9c3c57f7aeced1dad6f7aca5552d01f696f8ea26':
DO NOT MERGE: Fix bug #
15161058 Stability: ISE in Settings:Fragment DashboardSummary{
588de71} not attached to Activity
Fabrice Di Meglio [Tue, 27 May 2014 22:24:07 +0000 (22:24 +0000)]
am
42c4b0ab: (-s ours) DO NOT MERGE: Optimize Dashboard loading
* commit '
42c4b0abe5578a7812844ad5205ffc3b87cf3072':
DO NOT MERGE: Optimize Dashboard loading
Dave Langemak [Tue, 27 May 2014 21:25:51 +0000 (21:25 +0000)]
Merge "Move mobile data dis/enable to Telephony" into lmp-preview-dev
Fabrice Di Meglio [Thu, 22 May 2014 18:27:43 +0000 (11:27 -0700)]
DO NOT MERGE: Fix bug #
15161058 Stability: ISE in Settings:Fragment DashboardSummary{
588de71} not attached to Activity
- prevent rebuilding the UI until the fragment got attached
Change-Id: I6d5fcbce2581f3fc9900f1ca4fc8178ee959061e
(cherry picked from commit
53d76860a53c1463d182d4f3d28ce8e9f48454f3)
Fabrice Di Meglio [Thu, 22 May 2014 17:30:03 +0000 (10:30 -0700)]
DO NOT MERGE: Optimize Dashboard loading
- prevent loading categories twice
- add some logging to see the time taken for building the Dashboard titles
Change-Id: I31724c0e66fe3b453a87f12476f58db84c73423f
(cherry picked from commit
b644f29313c086806d1ba5ad3db8ac36d2bf3c4f)
Robert Greenwalt [Thu, 22 May 2014 03:02:32 +0000 (20:02 -0700)]
Move mobile data dis/enable to Telephony
ConnectivityService doesn't do this anymore.
bug:
15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit
0d4c500e98f7499db524c8073e2c8e9dfaa1febb)
John Spurlock [Tue, 27 May 2014 19:26:04 +0000 (19:26 +0000)]
am
66548844: Merge "Settings: Hide phone-related settings on tablets." into lmp-preview-dev
* commit '
665488441761a0d6cae2498eff935de31a1a7f9f':
Settings: Hide phone-related settings on tablets.
John Spurlock [Tue, 27 May 2014 19:23:24 +0000 (19:23 +0000)]
Merge "Settings: Hide phone-related settings on tablets." into lmp-preview-dev
John Spurlock [Tue, 27 May 2014 15:10:52 +0000 (11:10 -0400)]
Settings: Hide phone-related settings on tablets.
Bug:
15002393
Bug:
15091008
Change-Id: I8238b7990572f46e1530a800897ab2d39a189055
Baligh Uddin [Tue, 27 May 2014 18:32:41 +0000 (18:32 +0000)]
Merge "You broke the build. off you go."
Baligh Uddin [Tue, 27 May 2014 18:32:34 +0000 (18:32 +0000)]
You broke the build. off you go.
Revert "Import translations. DO NOT MERGE"
This reverts commit
416d11b4a9e3bdbdfecc27eb193b58c209a1d8e8.
Change-Id: I58f2611d81652317590c2d59737ae6acec435f50
John Spurlock [Tue, 27 May 2014 18:03:48 +0000 (18:03 +0000)]
am
85315533: Settings: Performance tweaks for SeekBarVolumizer.
* commit '
85315533a19aa61a0c5fc27d3f783c3f21e3878f':
Settings: Performance tweaks for SeekBarVolumizer.
John Spurlock [Tue, 27 May 2014 17:12:35 +0000 (13:12 -0400)]
Settings: Performance tweaks for SeekBarVolumizer.
Bind to existing volumizer instance when possible.
Bug:
15091992
Change-Id: I26248967ff85fdb7a850451336d6850e508d4f18
Baligh Uddin [Mon, 26 May 2014 21:46:09 +0000 (14:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I05a100b276a03069630751b1edeac5701ea1d02d
Auto-generated-cl: translation import
John Spurlock [Sat, 24 May 2014 18:46:32 +0000 (18:46 +0000)]
am
85ba0ee6: Fix crash when launching zen mode settings.
* commit '
85ba0ee6ec978b760720f1ece3e8e64e0340d260':
Fix crash when launching zen mode settings.
John Spurlock [Sat, 24 May 2014 18:40:05 +0000 (14:40 -0400)]
Fix crash when launching zen mode settings.
The switch bar is only accessible in onActivityCreated. Defer
initialization until then.
Bug:
15214851
Change-Id: Ie026d46250dae397ba0af02e833bb178631fe708
Fabrice Di Meglio [Sat, 24 May 2014 01:34:11 +0000 (01:34 +0000)]
am
7ca0cd41: Merge "Make smooth transition between Search fragment and the others" into lmp-preview-dev
* commit '
7ca0cd415c4d5069e4981a6d5e41e8aa9a43f23e':
Make smooth transition between Search fragment and the others
Fabrice Di Meglio [Sat, 24 May 2014 01:31:42 +0000 (01:31 +0000)]
Merge "Make smooth transition between Search fragment and the others" into lmp-preview-dev
Fabrice Di Meglio [Sat, 24 May 2014 01:17:09 +0000 (18:17 -0700)]
Add Indexing and Search for ChooseLockGenericFragment
- clean some imports
- add key and title to security_settings_picker.xml
- add ChooseLockGenericFragment in SearchIndexableResources
Change-Id: I867a1e11905cc4059d6eccabeab04d55cc3d799e
Dianne Hackborn [Sat, 24 May 2014 00:02:05 +0000 (00:02 +0000)]
am
0171fdba: Merge "Fix issue #
15185822: Stability: ArithmeticException: divide by zero" into lmp-preview-dev
* commit '
0171fdba7bd9b5acdcf0d32ffa12e07c69045a5d':
Fix issue #
15185822: Stability: ArithmeticException: divide by zero
Dianne Hackborn [Fri, 23 May 2014 23:59:23 +0000 (23:59 +0000)]
Merge "Fix issue #
15185822: Stability: ArithmeticException: divide by zero" into lmp-preview-dev
Fabrice Di Meglio [Fri, 23 May 2014 23:48:57 +0000 (23:48 +0000)]
am
7e4855e8: Update Search recents behavior
* commit '
7e4855e8f644bdecf68ec65b8c1b7c08624a4876':
Update Search recents behavior
Dianne Hackborn [Fri, 23 May 2014 23:47:10 +0000 (16:47 -0700)]
Fix issue #
15185822: Stability: ArithmeticException: divide by zero
Also small visual improvements.
Change-Id: I55dc30539a4ef67e9261f338c8c5a729a6958d9b
Fabrice Di Meglio [Fri, 23 May 2014 23:46:50 +0000 (16:46 -0700)]
Make smooth transition between Search fragment and the others
- use TransitionManager.beginDelayedTransition() and
getFragmentManager().executePendingTransactions()
Change-Id: I5d583916afb8b87dfe2b17b4e685ef5384c5fbd2
Fabrice Di Meglio [Fri, 23 May 2014 23:03:43 +0000 (16:03 -0700)]
Update Search recents behavior
- per UX request
- Search recents show now by defaults with the recent searches
when the SearchView is empty
- when we press on a Serach recent, we are showing the Search results
and the recents are disappearing
- when keying text in the SearchView, we hide the recents and start
showing the results
- we still save the Search query when hitting on a result
Change-Id: I6c2be21660a30f6973dea27d4852b2068a05963d
Fabrice Di Meglio [Fri, 23 May 2014 21:13:42 +0000 (21:13 +0000)]
am
2416a3e0: Seventh batch of new Quantum Theme assets
* commit '
2416a3e071785241c15463b20d1d34001ba931af':
Seventh batch of new Quantum Theme assets
Fabrice Di Meglio [Fri, 23 May 2014 21:01:34 +0000 (14:01 -0700)]
Seventh batch of new Quantum Theme assets
- needed for Quantum Theme support
See bug #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I93b060d016620a304f2e34cee498f9e2357a6cb6
Fabrice Di Meglio [Fri, 23 May 2014 20:13:51 +0000 (20:13 +0000)]
am
5370e2e7: (-s ours) Merge "Sixth batch of new Quantum Theme assets - DO NOT MERGE" into lmp-preview-dev
* commit '
5370e2e7755082997d6811cba325941ead46518d':
Sixth batch of new Quantum Theme assets - DO NOT MERGE
Fabrice Di Meglio [Fri, 23 May 2014 20:13:50 +0000 (20:13 +0000)]
am
52ed90b3: (-s ours) Fifth batch of new Quantum Theme assets - DO NOT MERGE
* commit '
52ed90b31184dc68cfac0edeeae5ba18aa2eea94':
Fifth batch of new Quantum Theme assets - DO NOT MERGE
Fabrice Di Meglio [Fri, 23 May 2014 20:13:50 +0000 (20:13 +0000)]
am
058df7d0: (-s ours) Merge "Fix bug #
15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE" into lmp-preview-dev
* commit '
058df7d01fa592b8b0068db9a7770a7eaf3f46f0':
Fix bug #
15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE
Fabrice Di Meglio [Fri, 23 May 2014 20:10:09 +0000 (20:10 +0000)]
Merge "Sixth batch of new Quantum Theme assets - DO NOT MERGE" into lmp-preview-dev
Fabrice Di Meglio [Fri, 23 May 2014 02:17:36 +0000 (19:17 -0700)]
Sixth batch of new Quantum Theme assets - DO NOT MERGE
- needed for Quantum Theme support
See bug #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: Iaec517aa448b1590bcb355ac8694b2e4e0c90292
(cherry picked from commit
58473734485d2eb17e71b5a63a1be7f7e09ce651)
Fabrice Di Meglio [Fri, 23 May 2014 01:14:24 +0000 (18:14 -0700)]
Fifth batch of new Quantum Theme assets - DO NOT MERGE
- needed for Quantum Theme support
See bug #
13140648 Settings needs to support the new Quantum Paper theme
Change-Id: I04e31e277d59d97f7871dde6bdb6a7099c7a8d65
(cherry picked from commit
dcfa52c524591370e8a3b7f237e7a475a234b21c)
Fabrice Di Meglio [Fri, 23 May 2014 17:57:24 +0000 (17:57 +0000)]
Merge "Fix bug #
15173703 Crash in Settings is observed when Android Beam page orientation is changed. DO NOT MERGE" into lmp-preview-dev