PauloftheWest
9de00da82f
am b29e0751: am ca6d88aa: am 0da1f851: Removed WPA PSK from HotSpot Options
...
* commit 'b29e0751d3984b8da729587f74aac43168e824bc':
Removed WPA PSK from HotSpot Options
2014-07-22 23:49:11 +00:00
PauloftheWest
b29e0751d3
am ca6d88aa: am 0da1f851: Removed WPA PSK from HotSpot Options
...
* commit 'ca6d88aac96171adab56d51cea9bc315c9966948':
Removed WPA PSK from HotSpot Options
2014-07-22 23:45:14 +00:00
PauloftheWest
ca6d88aac9
am 0da1f851: Removed WPA PSK from HotSpot Options
...
* commit '0da1f8515a6af368a923cc99e5435795a031692a':
Removed WPA PSK from HotSpot Options
2014-07-22 23:40:20 +00:00
Alan Viverette
5510a9e640
am 3322a5e5: am 26eaa31c: am 47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev
...
* commit '3322a5e50a3831cf71ae5894a96a69c3151ae033':
Stop using framework-private switch asset
2014-07-22 23:40:18 +00:00
Alan Viverette
3322a5e50a
am 26eaa31c: am 47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev
...
* commit '26eaa31cf100f22050bee0780264a3e6c40c1dac':
Stop using framework-private switch asset
2014-07-22 23:33:44 +00:00
PauloftheWest
0da1f8515a
Removed WPA PSK from HotSpot Options
...
Bug: 16380972
Change-Id: I77735ff7a8962d538132bb55ebbf6cc75358f8a1
2014-07-22 23:31:27 +00:00
Alan Viverette
26eaa31cf1
am 47d27bd6: Merge "Stop using framework-private switch asset" into lmp-dev
...
* commit '47d27bd629838ded2d217f238b6e3b21d18485da':
Stop using framework-private switch asset
2014-07-22 23:25:38 +00:00
Fabrice Di Meglio
d3af3937d6
am 0c634a11: am 4ad8602a: am 3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev
...
* commit '0c634a11a8a86fe0ccde7ddd839a3b00a34c12fd':
Add Home / Launcher apps indexing
2014-07-22 22:29:11 +00:00
Fabrice Di Meglio
0c634a11a8
am 4ad8602a: am 3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev
...
* commit '4ad8602ac358672f7f1b162930eccb7e96e223f5':
Add Home / Launcher apps indexing
2014-07-22 22:24:58 +00:00
Fabrice Di Meglio
4ad8602ac3
am 3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev
...
* commit '3f3426e0d95aed9ab651a703a3a7e33833cd4741':
Add Home / Launcher apps indexing
2014-07-22 22:20:39 +00:00
Alexandra Gherghina
b381275989
am ec765ce1: am 534b84e9: am 6d839875: Revert "Revert "Move global sync settings to AccountSettings.""
...
* commit 'ec765ce1127c4419fb71a0b1d90053e19d0b7f38':
Revert "Revert "Move global sync settings to AccountSettings.""
2014-07-22 21:55:33 +00:00
Alexandra Gherghina
ec765ce112
am 534b84e9: am 6d839875: Revert "Revert "Move global sync settings to AccountSettings.""
...
* commit '534b84e9f834b366a6fdccfe9f968c1b045f1377':
Revert "Revert "Move global sync settings to AccountSettings.""
2014-07-22 21:47:30 +00:00
Alexandra Gherghina
534b84e9f8
am 6d839875: Revert "Revert "Move global sync settings to AccountSettings.""
...
* commit '6d839875b74f1570e8807005c586298beb677413':
Revert "Revert "Move global sync settings to AccountSettings.""
2014-07-22 21:39:17 +00:00
Alan Viverette
47d27bd629
Merge "Stop using framework-private switch asset" into lmp-dev
2014-07-22 20:33:22 +00:00
Alan Viverette
09be4b3c87
Stop using framework-private switch asset
...
BUG: 16467249
Change-Id: I0829c3dea522cf59e0f92046ea7c6092d416ad4c
2014-07-22 16:11:01 -07:00
Alexandra Gherghina
6d839875b7
Revert "Revert "Move global sync settings to AccountSettings.""
...
This reverts commit 4869faf465 .
Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab
2014-07-22 20:25:24 +00:00
John Spurlock
a2b423094e
am 22cbe6b7: am badae7d8: am 59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev
...
* commit '22cbe6b7354579add5e4e0ba6edd30cb5987d1fd':
Settings: No really, keep the trailing space.
2014-07-22 19:38:18 +00:00
John Spurlock
22cbe6b735
am badae7d8: am 59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev
...
* commit 'badae7d89585d55e7ba9e74d5cbb480f8c446704':
Settings: No really, keep the trailing space.
2014-07-22 19:31:13 +00:00
John Spurlock
badae7d895
am 59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev
...
* commit '59ea80b781d8c541076f185cfa81084668521ba5':
Settings: No really, keep the trailing space.
2014-07-22 19:26:32 +00:00
Tadashi G. Takaoka
e10bb11144
am d00a99d7: am 1909e7db: am 1f539374: Use SwitchPreference for input method subtype enabler
...
* commit 'd00a99d710457993ca3fbd8142df789280d33107':
Use SwitchPreference for input method subtype enabler
2014-07-22 17:46:42 +00:00
Tadashi G. Takaoka
d00a99d710
am 1909e7db: am 1f539374: Use SwitchPreference for input method subtype enabler
...
* commit '1909e7db89b80798d13973a60a264687a2420486':
Use SwitchPreference for input method subtype enabler
2014-07-22 17:43:33 +00:00
Tadashi G. Takaoka
14bfedca72
am 9ddc7821: am 5aa55632: am 686c2503: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev
...
* commit '9ddc782101b2df3f418b0b5e1b36c561772b6ecd':
Use OnPreferenceChangeLister for subtype enabler
2014-07-22 17:42:25 +00:00
Tadashi G. Takaoka
1909e7db89
am 1f539374: Use SwitchPreference for input method subtype enabler
...
* commit '1f53937469095f268d4c7a21d93f821a341a151d':
Use SwitchPreference for input method subtype enabler
2014-07-22 17:37:01 +00:00
Tadashi G. Takaoka
9ddc782101
am 5aa55632: am 686c2503: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev
...
* commit '5aa556322c672ff112e68019ae9e3396aae20b81':
Use OnPreferenceChangeLister for subtype enabler
2014-07-22 17:34:54 +00:00
Baligh Uddin
53514a8df0
am 615843b7: (-s ours) am 601ce0b9: (-s ours) am 64a83092: (-s ours) Import translations. DO NOT MERGE
...
* commit '615843b7316ad0c902daa840381059c97fb4af27':
Import translations. DO NOT MERGE
2014-07-22 17:32:48 +00:00
Tadashi G. Takaoka
5aa556322c
am 686c2503: Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev
...
* commit '686c250323553231f5b314525b221f7000e88572':
Use OnPreferenceChangeLister for subtype enabler
2014-07-22 17:27:20 +00:00
Tadashi G. Takaoka
1f53937469
Use SwitchPreference for input method subtype enabler
...
Bug: 15781377
Change-Id: I80fe987e499722af7768147a184934650bbf8385
2014-07-22 17:22:15 +00:00
Baligh Uddin
615843b731
am 601ce0b9: (-s ours) am 64a83092: (-s ours) Import translations. DO NOT MERGE
...
* commit '601ce0b98a18084dce5a0d74a66b20e57297aa55':
Import translations. DO NOT MERGE
2014-07-22 17:22:01 +00:00
Baligh Uddin
601ce0b98a
am 64a83092: (-s ours) Import translations. DO NOT MERGE
...
* commit '64a830925096f8ca843ae0685dea9d171bd256ee':
Import translations. DO NOT MERGE
2014-07-22 17:14:41 +00:00
Baligh Uddin
04c5b35d6e
Import translations. DO NOT MERGE
...
Change-Id: Ie683e8b74d9ca12391a9c48713a7d736efc4a338
Auto-generated-cl: translation import
2014-07-22 17:08:22 +00:00
Baligh Uddin
64a8309250
Import translations. DO NOT MERGE
...
Change-Id: I9f9207a53b8bc1f312ae7e8c6f4bb3b259dba370
Auto-generated-cl: translation import
2014-07-22 17:04:41 +00:00
Fabrice Di Meglio
3f3426e0d9
Merge "Add Home / Launcher apps indexing" into lmp-dev
2014-07-22 16:21:19 +00:00
Fabrice Di Meglio
d73045db7a
Add Home / Launcher apps indexing
...
- add a BaseSearchIndexProvider to HomeSettings
- use a BroadcastReceiver for tracking add or remove of
Home / Launcher apps
- add "launcher" synonym for "home" too
- also code cleaning for DynamicIndexableContentMonitor
See bug: #16484927 Add "launcher" as a synonym for "home" in settings search
Change-Id: I819f4e5f7bd5e9a7882609206b2733ea1912fc69
2014-07-22 15:13:54 -07:00
Adrian Roos
fd43c8d9c0
am b28e34f4: am 4c177cbd: am 2c22d6d2: Fix and simplify advanced security settings layout
...
* commit 'b28e34f4c54eb5c3110420551ff2e8a1bf78a9c3':
Fix and simplify advanced security settings layout
2014-07-22 14:14:32 +00:00
Alexandra Gherghina
b9a8e722fa
am 7258665b: am c58595f2: am 4869faf4: Revert "Move global sync settings to AccountSettings."
...
* commit '7258665bd0a6b5693cf0b38faaee16af9d20bae9':
Revert "Move global sync settings to AccountSettings."
2014-07-22 14:14:32 +00:00
Alexandra Gherghina
4443270ad4
am 6c92599f: am 761dad79: am 64fde6f4: Move global sync settings to AccountSettings.
...
* commit '6c92599f369fb884a9affa7dcf9fcedcec111257':
Move global sync settings to AccountSettings.
2014-07-22 14:14:31 +00:00
Dianne Hackborn
84c94b10ae
am a467c341: am fb420af3: am ff795ffb: Unify voice interactor and recognizer settings.
...
* commit 'a467c3410a68930b04cfddd890f7ffd71e0dd6ed':
Unify voice interactor and recognizer settings.
2014-07-22 13:58:05 +00:00
Adrian Roos
b28e34f4c5
am 4c177cbd: am 2c22d6d2: Fix and simplify advanced security settings layout
...
* commit '4c177cbd18136b3c60a1fe531f2d3d2cc5e5de26':
Fix and simplify advanced security settings layout
2014-07-22 13:56:36 +00:00
Alexandra Gherghina
7258665bd0
am c58595f2: am 4869faf4: Revert "Move global sync settings to AccountSettings."
...
* commit 'c58595f22562c25af75ee1c2088abaaed0ac18a4':
Revert "Move global sync settings to AccountSettings."
2014-07-22 13:56:36 +00:00
Alexandra Gherghina
6c92599f36
am 761dad79: am 64fde6f4: Move global sync settings to AccountSettings.
...
* commit '761dad7901f49e47d8ce5655f77125c7ed428484':
Move global sync settings to AccountSettings.
2014-07-22 13:56:35 +00:00
Dianne Hackborn
a467c3410a
am fb420af3: am ff795ffb: Unify voice interactor and recognizer settings.
...
* commit 'fb420af379a42fa6d8ca5e766fbfa663a321e825':
Unify voice interactor and recognizer settings.
2014-07-22 13:38:43 +00:00
Adrian Roos
4c177cbd18
am 2c22d6d2: Fix and simplify advanced security settings layout
...
* commit '2c22d6d2040cc846dbaf5152191cc15c5c5995ab':
Fix and simplify advanced security settings layout
2014-07-22 13:36:39 +00:00
Alexandra Gherghina
c58595f225
am 4869faf4: Revert "Move global sync settings to AccountSettings."
...
* commit '4869faf46559c54a34b969b5ae5391a208e723af':
Revert "Move global sync settings to AccountSettings."
2014-07-22 13:36:39 +00:00
Alexandra Gherghina
761dad7901
am 64fde6f4: Move global sync settings to AccountSettings.
...
* commit '64fde6f4e9404a363f577a9fda424affcb5138e4':
Move global sync settings to AccountSettings.
2014-07-22 13:36:38 +00:00
Dianne Hackborn
fb420af379
am ff795ffb: Unify voice interactor and recognizer settings.
...
* commit 'ff795ffba80e8a6455f27fab7ad0e8e14e2ec9a4':
Unify voice interactor and recognizer settings.
2014-07-22 12:18:00 +00:00
Adrian Roos
2c22d6d204
Fix and simplify advanced security settings layout
...
Provides correct padding for tablets and sets background
drawable.
Bug: 16382821
Change-Id: I0aa0c9f8c6fccb6c201e78075c37a7c7e2315d07
2014-07-22 12:08:44 +00:00
Alexandra Gherghina
4869faf465
Revert "Move global sync settings to AccountSettings."
...
This reverts commit 64fde6f4e9 .
Change-Id: I61940b6e2936c7c7f048af222602226e5588c268
2014-07-22 12:01:54 +00:00
Alexandra Gherghina
64fde6f4e9
Move global sync settings to AccountSettings.
...
It also makes AccountSettings respond to the SYNC_SETTINGS intent, which
it is currently triggered by Calendar and could be triggered by Gmail.
Bug: 16076571
Change-Id: I2c55262a87e46ba88f36a90a2f8f27d08f88e851
2014-07-22 12:00:10 +00:00
Dianne Hackborn
ff795ffba8
Unify voice interactor and recognizer settings.
...
There is now one settings UI to select both the new
voice interactor and old voice recognizer.
There are still a few wonky things about this that won't
be resolved until we start requiring that all interactors
specify an associated recognizer service.
Change-Id: Ib702ff717fb28bcb244cb30e49577066ddc9f197
2014-07-21 20:14:43 -07:00
Fabrice Di Meglio
be99cfa1db
am 8ed3a2f6: am 794fb56f: am f6f1e2ba: Merge "Remove fake 8dp padding on N7 devices" into lmp-dev
...
* commit '8ed3a2f6d3913cd2b2442aa190078e49b78d53ec':
Remove fake 8dp padding on N7 devices
2014-07-22 02:40:18 +00:00