Paul Lawrence
381424c952
Merge "Disable orientation switching on CryptKeeper screen"
2014-06-02 14:47:21 +00:00
Russell Brenner
4ad687a0d8
Merge "Refactor setup wizard-related code"
2014-06-02 04:33:42 +00:00
Fabrice Di Meglio
09626a8af6
am 23c6666a
: (-s ours) Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE
...
* commit '23c6666a88294acc5a43993cd305a8700b34d03e':
Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE
2014-05-31 01:56:10 +00:00
Fabrice Di Meglio
23c6666a88
Add Indexing and Search for ChooseLockGenericFragment - DO NOT MERGE
...
Manual report of 0897f975c1
- clean some imports
- add key and title to security_settings_picker.xml
- add ChooseLockGenericFragment in SearchIndexableResources
Change-Id: I3ab77677f3d926b0a3eb9be5d77ee23b568856aa
2014-05-30 17:59:00 -07:00
Fabrice Di Meglio
90be51d539
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
2014-05-30 16:58:07 -07:00
Russell Brenner
d3446c5708
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
2014-05-30 16:16:30 -07:00
John Spurlock
789b3e8fc0
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.
2014-05-30 23:13:16 +00:00
John Spurlock
a391d9c6ac
Merge "ZenSettings: Only show "next day" if start >= end time." into lmp-preview-dev
2014-05-30 23:08:13 +00:00
John Spurlock
c2f06e06c2
ZenSettings: Only show "next day" if start >= end time.
...
Bug:15345316
Change-Id: Ic1130dc639f63ae6026f7c7ba2a0ad9402557ce7
2014-05-30 19:04:53 -04:00
Fabrice Di Meglio
b438c13265
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
2014-05-30 22:39:53 +00:00
Fabrice Di Meglio
2aa322991d
Merge "Fix bug #15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app" into lmp-preview-dev
2014-05-30 22:36:05 +00:00
Fabrice Di Meglio
b2385ea462
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
2014-05-30 15:35:06 -07:00
Chris Wren
2221cb6f6a
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.
2014-05-30 21:43:43 +00:00
Chris Wren
d711b22130
Merge "Support audience filtering in the Zen Mode settings." into lmp-preview-dev
2014-05-30 21:37:56 +00:00
Fabrice Di Meglio
cac94ba246
am 2bc41e29
: Merge "Fix bug #15342475 Settings search ranking improvement" into lmp-preview-dev
...
* commit '2bc41e29b99961cbb3d879b1b45e4b14d8a5f3e1':
Fix bug #15342475 Settings search ranking improvement
2014-05-30 21:33:47 +00:00
Santos Cordon
5a1233e7df
am 3afbdf00
: Update showCallScreen to use Telecomm (6/6)
...
* commit '3afbdf006057c93f930694e26306a3cc9cea34e4':
Update showCallScreen to use Telecomm (6/6)
2014-05-30 21:32:50 +00:00
Fabrice Di Meglio
2bc41e29b9
Merge "Fix bug #15342475 Settings search ranking improvement" into lmp-preview-dev
2014-05-30 21:09:17 +00:00
Fabrice Di Meglio
eed44c9d5f
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
2014-05-30 14:05:32 -07:00
Chris Wren
7ad86dce1c
Support audience filtering in the Zen Mode settings.
...
Depends-On: I7c91dec1afeb54505426c4da59ec4d072a60c240
Change-Id: Idf5523e225c1368a43bf46338490c69ed9dffd09
2014-05-30 16:33:28 -04:00
Paul Lawrence
548fd30612
Merge "Fix marqueeing of OwnerText on CryptKeeper screens"
2014-05-30 14:45:44 +00:00
Santos Cordon
3afbdf0060
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
2014-05-29 22:35:43 -07:00
Fabrice Di Meglio
7d21de5186
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
2014-05-30 02:48:13 +00:00
Fabrice Di Meglio
d4757e088b
Merge "Fix bug #15330860 “More...” item in Settings should not have an icon" into lmp-preview-dev
2014-05-30 02:43:29 +00:00
Fabrice Di Meglio
09786c529b
Fix bug #15330860 “More...” item in Settings should not have an icon
...
- update the string to say "NFC & more"
Change-Id: Ic61e4a85cc6dfd6f32443656d9fb3ef5f9577a6e
2014-05-29 19:19:52 -07:00
Fabrice Di Meglio
bc9ad9b390
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
2014-05-30 01:28:03 +00:00
Fabrice Di Meglio
c9a972ab2a
Merge "Fix bug #15330860 “More...” item in Settings should not have an icon" into lmp-preview-dev
2014-05-30 01:23:10 +00:00
Fabrice Di Meglio
aa66e80944
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
2014-05-29 18:21:37 -07:00
Fabrice Di Meglio
40e9bd000e
am bc16c5dd
: Merge "Update ActionBar for using contentInsetStart" into lmp-preview-dev
...
* commit 'bc16c5ddac0aab9f4bf69913ca2b8877e9a7daf6':
Update ActionBar for using contentInsetStart
2014-05-30 00:51:41 +00:00
Fabrice Di Meglio
bc16c5ddac
Merge "Update ActionBar for using contentInsetStart" into lmp-preview-dev
2014-05-30 00:47:43 +00:00
Fabrice Di Meglio
6338695711
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
2014-05-29 15:18:01 -07:00
John Reck
7f4a7a114f
am 84f2d7ee
: Merge "Remove unsupported visual_lines" into lmp-preview-dev
...
* commit '84f2d7ee4cf6b1d4258b35ce23b57ac145c951ae':
Remove unsupported visual_lines
2014-05-29 18:06:13 +00:00
John Reck
84f2d7ee4c
Merge "Remove unsupported visual_lines" into lmp-preview-dev
2014-05-29 18:01:41 +00:00
Ido Ofir
b393848454
Merge "Moving the trust agents settings in the security settings menu and adding personal unlock."
2014-05-29 17:29:19 +00:00
Paul Lawrence
7836ae8b55
Fix marqueeing of OwnerText on CryptKeeper screens
...
Have to call setSelected to make marqueeing work.
Change-Id: Ic00012c150a9cacfff2b11f2938ea0674a1f45e9
2014-05-29 10:19:08 -07:00
John Reck
dec9ce489c
Remove unsupported visual_lines
...
Change-Id: I710ad2d3f121203f64ea8246a1a85662b335b9e3
2014-05-29 10:16:33 -07:00
Alexandra Gherghina
ff0f1d8049
Merge "Adds missing accessibility string for accounts syncing"
2014-05-29 16:29:44 +00:00
Paul Lawrence
eca15e18c6
Disable orientation switching on CryptKeeper screen
...
Consensus is that it adds no usability, but creates bugs and unpleasantness.
@bug 14415329
Change-Id: Icd682e5199d0d7b5d2f25b6e772e6e3cdb3a9bb0
2014-05-29 08:10:22 -07:00
Fabrice Di Meglio
21300597d1
Merge "FR #15314612 - Enable search on non accentuated chars"
2014-05-28 23:23:15 +00:00
Fabrice Di Meglio
62909fd0cd
Merge "Search - prepare for better normalization"
2014-05-28 23:22:55 +00:00
Fabrice Di Meglio
363348dd8b
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
2014-05-28 16:20:38 -07:00
Brian Carlstrom
5db7b07dc9
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
2014-05-28 23:18:47 +00:00
Brian Carlstrom
f354290901
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
2014-05-28 23:13:26 +00:00
Fabrice Di Meglio
a8ac78b392
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
2014-05-28 15:56:30 -07:00
Brian Carlstrom
2ce0dcdad4
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
2014-05-28 22:31:43 +00:00
Brian Carlstrom
70f2201c7a
Merge "Move to dalvik.vm.lib.2 to force default to libart"
2014-05-28 22:28:47 +00:00
Brian Carlstrom
9d7e2b1949
Move to dalvik.vm.lib.2 to force default to libart
...
Bug: 14298175
(cherry picked from commit 3bc8aaad29
)
Change-Id: I5c551d6d6f00af5a7b3638e3847950e441414e37
2014-05-28 14:48:15 -07:00
Brian Carlstrom
7a99bfdaa8
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
2014-05-28 21:44:57 +00:00
Brian Carlstrom
238be024d7
Merge "Move to dalvik.vm.lib.2 to force default to libart" into lmp-preview-dev
2014-05-28 21:39:36 +00:00
Brian Carlstrom
3bc8aaad29
Move to dalvik.vm.lib.2 to force default to libart
...
Bug: 14298175
Change-Id: I5ebd13eebf42c998418ef79381d9c8b89aaf5c0c
2014-05-28 14:31:47 -07:00
John Spurlock
6926224f73
am 4e4cdeff
: Settings: Remove sound settings.
...
* commit '4e4cdeffdb6087c953f44808f14f18554a749bda':
Settings: Remove sound settings.
2014-05-28 20:52:56 +00:00