PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,519 Commits 1 Branch 0 Tags
3d02da4d1c2cd60f95dcf9c9fbc9918c707b8f6c
Commit Graph

13519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
762eb7a9ca merge in master-release history after reset to master 2014-04-23 05:51:07 -07:00
Alexandra Gherghina
400899efa5 Merge "Revert "Wiring for displaying managed profiles"" 2014-04-23 10:55:51 +00:00
Alexandra Gherghina
91e3f72569 Revert "Wiring for displaying managed profiles" 
This reverts commit a044235272.

This depended on CL: https://googleplex-android-review.googlesource.com/#/q/I2907b182e19b3562592da688b3f68ef5f4088557 which was not commited yet.

Bug: 13756871
Change-Id: Ib05c58002a06c7882c4b6dfd750c9681ff4b1646
 2014-04-23 10:55:41 +00:00
Alexandra Gherghina
5e76b65dcf Merge "Wiring for displaying managed profiles" 2014-04-23 07:04:34 +00:00
Baligh Uddin
593ba34c1f am 293b1fc0: (-s ours) am 06172af6: (-s ours) Import translations. DO NOT MERGE 
* commit '293b1fc04dbcdecab4c2a9b4a718b01264612fbb':
  Import translations. DO NOT MERGE
 2014-04-23 02:20:43 +00:00
Baligh Uddin
293b1fc04d am 06172af6: (-s ours) Import translations. DO NOT MERGE 
* commit '06172af69451678f5d1dd388a372ab00b58d682f':
  Import translations. DO NOT MERGE
 2014-04-23 02:13:34 +00:00
Baligh Uddin
06172af694 Import translations. DO NOT MERGE 
Change-Id: I9185da8de4b0c0818b926377543992356f265dd9
Auto-generated-cl: translation import
 2014-04-22 17:59:15 -07:00
Ruchi Kandoi
0b1f3fb2c9 Setting: Developer Option: Adds a low power mode checkbox 
Change-Id: I489f74bd3822f64acb8becd6e5eda716d8bd722c
Signed-off-by: Ruchi Kandoi<kandoiruchi@google.com>
 2014-04-22 20:55:19 +00:00
Amith Yamasani
6f3a760dad Merge "Temporary color change to make lock pattern screen visible" 2014-04-22 19:20:15 +00:00
Christopher Tate
372b02c997 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
 2014-04-22 18:31:33 +00:00
Christopher Tate
a83515813c 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
 2014-04-22 18:09:27 +00:00
Christopher Tate
442f01c601 am 95228074: am c44d7c6b: Prohibit uninstall of the default (or only) home app 
* commit '95228074d2e01575799a526a29ec53a61c36aa23':
  Prohibit uninstall of the default (or only) home app
 2014-04-22 18:05:39 +00:00
Christopher Tate
95228074d2 am c44d7c6b: Prohibit uninstall of the default (or only) home app 
* commit 'c44d7c6be64be790878ddf1f21c0d9e91d238245':
  Prohibit uninstall of the default (or only) home app
 2014-04-22 17:58:59 +00:00
Christopher Tate
c44d7c6be6 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
 2014-04-22 10:42:10 -07:00
Amith Yamasani
9690b19636 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
 2014-04-22 09:37:49 -07:00
John Spurlock
32ec088a19 Merge "Do not disturb settings page." 2014-04-22 15:04:07 +00:00
Baligh Uddin
9ee2f52b73 Merge "Import translations. DO NOT MERGE" 2014-04-22 14:51:47 +00:00
John Spurlock
cc819a67f4 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
 2014-04-22 10:23:16 -04:00
The Android Automerger
a918fe8ba1 merge in master-release history after reset to master 2014-04-22 05:50:28 -07:00
Fabrice Di Meglio
891bbfdbb7 Merge "Save Search queries" 2014-04-22 01:38:47 +00:00
Fabrice Di Meglio
ab791fccf9 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
 2014-04-21 18:35:30 -07:00
Fabrice Di Meglio
4bedf88f3d Merge "Fix missing summary for CheckBoxPreference" 2014-04-21 23:41:13 +00:00
Fabrice Di Meglio
b7390ba585 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
 2014-04-21 16:40:48 -07:00
Fabrice Di Meglio
1be99217c6 Merge "Rename SettingsUtils to PrintSettingsUtils" 2014-04-21 23:00:22 +00:00
Fabrice Di Meglio
63609c58a0 Rename SettingsUtils to PrintSettingsUtils 
Change-Id: I67e9222265f6326b399de3779f2210e202777ecd
 2014-04-21 15:58:41 -07:00
Fabrice Di Meglio
d50c87ff47 Fix bug #14228591 NPE in settings app when it is launched by UiAutomator 
- test for null references

Change-Id: Iff6efc92cc16ada9f6e8f057ba9c23a241e62000
 2014-04-21 15:41:17 -07:00
Fabrice Di Meglio
2ce2fd2085 Merge "Fix bug #14228591 NPE in settings app when it is launched by UiAutomator" 2014-04-21 22:35:06 +00:00
Fabrice Di Meglio
6d7bb92b38 Fix bug #14228591 NPE in settings app when it is launched by UiAutomator 
- test for null references

Change-Id: Iff6efc92cc16ada9f6e8f057ba9c23a241e62000
 2014-04-21 15:32:28 -07:00
Baligh Uddin
9190949a83 Import translations. DO NOT MERGE 
Change-Id: I04673ea4fce055c657b8b36ba765b74747495748
Auto-generated-cl: translation import
 2014-04-21 13:50:52 -07:00
Fabrice Di Meglio
59a672ae4a Merge "Code cleaning" 2014-04-21 20:48:47 +00:00
Fabrice Di Meglio
7e920da656 Code cleaning 
- remove duplicate semicolon

Change-Id: I807ce89dfa6b46c415a95a9c6cdc71fd3e9a2502
 2014-04-21 13:46:39 -07:00
Fabrice Di Meglio
62a3ab41dc Merge "Enable Search result highlight for Accessibility and IME settings" 2014-04-21 20:29:12 +00:00
Fabrice Di Meglio
bb26141ddf 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
 2014-04-21 13:27:23 -07:00
Fabrice Di Meglio
42aacb1f50 Merge "Fix bug #14158603 Stability: NPE in Settings: Attempt to invoke... ...interface method 'boolean android.view.MenuItem.collapseActionView()' ...on a null object reference" 2014-04-21 19:46:39 +00:00
Fabrice Di Meglio
23ae00c1d8 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
 2014-04-21 12:43:20 -07:00
Fabrice Di Meglio
3e000df132 Merge "Fix NPE java.lang.IllegalStateException: Observer com.android.settings.SettingsPreferenceFragment$1@373ee1aa is already registered." 2014-04-21 18:49:43 +00:00
Fabrice Di Meglio
829c8fb2bc Fix NPE java.lang.IllegalStateException: Observer com.android.settings.SettingsPreferenceFragment$1@373ee1aa is already registered. 
- propertly register / unregister the DataSetObserver

Change-Id: I04de3c7ec14e71591edc174ebafabe9a1fb165c2
 2014-04-21 11:49:36 -07:00
Fabrice Di Meglio
842cff926c Merge "Better decoupling of Index updates in Bluetooth Settings" 2014-04-21 18:33:42 +00:00
Fabrice Di Meglio
131f49feea Better decoupling of Index updates in Bluetooth Settings 
- use a Handler
- force rebuilding

Change-Id: I474fa98ea0e0758abcc46d4812f744dff24fd455
 2014-04-21 11:32:39 -07:00
Fabrice Di Meglio
1105d1487a Merge "Force Search Index rebuilding for Wifi remembered networks" 2014-04-21 18:24:42 +00:00
Fabrice Di Meglio
da0e6ff8c2 Force Search Index rebuilding for Wifi remembered networks 
... when the WiFi swich will be toggled on/off

Change-Id: Iea93819e4c473aafc6aaedf6abb723969dbc9e52
 2014-04-21 11:24:33 -07:00
Fabrice Di Meglio
73358906d5 Merge "Better decoupling of Index updates in WiFi Settings" 2014-04-21 18:12:42 +00:00
Fabrice Di Meglio
784f266cbd Better decoupling of Index updates in WiFi Settings 
- use a Handler

Change-Id: I1e35f2e437021001900468d0df2b75e53b8c62f6
 2014-04-21 10:57:07 -07:00
Fabrice Di Meglio
a5c0c17304 Merge "Remove non needed code for HeaderAdapter" 2014-04-21 17:52:56 +00:00
Fabrice Di Meglio
f2dee29d66 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
 2014-04-21 10:52:34 -07:00
Fabrice Di Meglio
d33b04ff06 Merge "Search - optimize when updating the Index is done - part 2" 2014-04-21 17:15:51 +00:00
Fabrice Di Meglio
5cda21b449 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
 2014-04-21 10:14:28 -07:00
Fabrice Di Meglio
d4d829ff9b Merge "Search - optimize when updating the Index is done" 2014-04-21 16:43:21 +00:00
Fabrice Di Meglio
5ebabfcd35 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
 2014-04-21 09:42:41 -07:00
Fabrice Di Meglio
fd78ec72c3 Merge "Make highlithing delay consistent" 2014-04-21 16:33:05 +00:00