Jeff Sharkey
c6e3b0e448
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
2014-04-28 08:55:11 -07:00
John Spurlock
c41dfb4f6c
Update zen mode settings strings.
...
Change-Id: I0caeed5825cedb6be16384df4988aab0ea5cdbc6
2014-04-28 11:41:20 -04:00
Alexandra Gherghina
9a1baec5a3
Disable profile enabled check (API is changing)
...
Bug: 14377459
Change-Id: Ie79db95bcc5c7e3a95b479832dceaf628ae36728
2014-04-28 14:11:35 +01:00
The Android Automerger
7a19b82015
merge in master-release history after reset to ab8d3e5a03
2014-04-28 05:49:55 -07:00
The Android Automerger
7b7098641c
merge in master-release history after reset to ab8d3e5a03
2014-04-27 05:50:00 -07:00
Jeff Davidson
ab8d3e5a03
Merge "Fix NPE in AppListPreference when there is no default."
2014-04-26 18:44:35 +00:00
Jeff Davidson
6b176245f5
Fix NPE in AppListPreference when there is no default.
...
Bug: 14327074
Change-Id: I3b0dcfbefcfb91278582457beef5823072efc46a
2014-04-26 08:49:59 -07:00
The Android Automerger
2c96bd5fdc
merge in master-release history after reset to b0a7811742
2014-04-26 05:51:46 -07:00
Jun Su
bf427a2064
Fix NullPointerException issue when user change
...
When info is null, we have risk to have access null point.
Change-Id: Ie6acee5c99d6297e31d46585435a735a38b19e82
2014-04-26 13:36:06 +08:00
Derek Tan
b0a7811742
Merge "Fix the crash of BandMode app."
2014-04-26 00:27:01 +00:00
Fabrice Di Meglio
769630c895
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
2014-04-25 17:24:18 -07:00
Derek Tan
eb4575e8c2
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
2014-04-26 00:15:59 +00:00
Dianne Hackborn
1102f76e58
Merge "Show time remaining / to charge."
2014-04-25 17:06:50 +00:00
Elliott Hughes
57d7fa545b
resolved conflicts for merge of f90b5141
to master
...
Change-Id: I666b2fcde034f6dc9f7b69409facf88a4feb5309
2014-04-24 17:24:35 -07:00
Elliott Hughes
f90b514144
am 4c941850
: Merge "Track MutableBoolean\'s new package."
...
* commit '4c941850288011ca29466a1a80314155c0100fe3':
Track MutableBoolean's new package.
2014-04-24 23:59:10 +00:00
Elliott Hughes
4c94185028
Merge "Track MutableBoolean's new package."
2014-04-24 23:52:13 +00:00
Dianne Hackborn
0be7598cb8
Show time remaining / to charge.
...
Rework the battery graph to include the time remaining or
time to charge.
Change-Id: Ib26b761cb10e01f5f3aa4189db10d44b8ce62f89
2014-04-24 12:05:51 -07:00
Jeff Davidson
4f700a3b3c
Merge "Support ACTION_CHANGE_ACTIVE for network scorers."
2014-04-24 18:59:53 +00:00
Jeff Davidson
1875256811
Support ACTION_CHANGE_ACTIVE for network scorers.
...
Bug: 13785473
Change-Id: Ida54d4620f95c773c4c4239e9f29c1b987fd6ba2
2014-04-24 11:27:47 -07:00
Fabrice Di Meglio
b9968ff679
Merge "Fix bug #14288652 Settings crash on hitting back key from Tap and Pay screen"
2014-04-24 17:36:53 +00:00
Fabrice Di Meglio
405febf56a
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
2014-04-24 10:35:56 -07:00
Alexandra Gherghina
04f7e47458
Merge "Revert "Revert "Wiring for displaying managed profiles"""
2014-04-24 17:12:57 +00:00
Fabrice Di Meglio
812b199768
Merge "Settings new dashboard - part 1"
2014-04-24 17:08:22 +00:00
Alexandra Gherghina
423bafccbc
Revert "Revert "Wiring for displaying managed profiles""
...
This reverts commit 91e3f72569
.
Will wait until related commit is in to submit this.
Bug: 13756871
Change-Id: I34642998adb71f44de1e529cc214ac4f921932ed
2014-04-24 18:06:06 +01:00
Fabrice Di Meglio
63bbb8e4fe
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
2014-04-24 10:04:36 -07:00
Jeff Davidson
0b35070410
Merge "Refactor SmsListPreference into AppListPreference."
2014-04-24 16:49:19 +00:00
Baligh Uddin
1502fba4be
Merge "Import translations. DO NOT MERGE"
2014-04-24 14:30:48 +00:00
The Android Automerger
3e78ce7956
merge in master-release history after reset to 018004496d
2014-04-24 05:52:31 -07:00
Elliott Hughes
309004706c
Track MutableBoolean's new package.
...
Change-Id: I96df3fcbc3b94186a36617dfc1df5b195880be13
2014-04-23 18:04:40 -07:00
Baligh Uddin
805f1e0124
Import translations. DO NOT MERGE
...
Change-Id: Ief4b4cbe513c64abe5b431c36f2aa79ced9c3bc1
Auto-generated-cl: translation import
2014-04-23 14:28:42 -07:00
Fabrice Di Meglio
018004496d
Merge "Add saved Search queries feature"
2014-04-23 17:35:52 +00:00
Fabrice Di Meglio
d297a58402
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
2014-04-23 10:35:10 -07:00
John Spurlock
6d26d10fb3
Notification settings: update lockscreen option language.
...
When device is locked:
- Show all notification content
- Hide sensitive notification content
Change-Id: I641bca5f1b5f0ab1b2dc381fc0af7f32a9f2bc6d
2014-04-23 11:37:27 -04:00
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