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

13880 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
b1d4e7ee7c Fix crash when adding account 
Remove the listener in onStop(), to be symmetrical with onStart().

Bug: 14393261
Change-Id: I5d4f0ca38d5ef52b97715b8f3791ff2a400c68e2
 2014-04-30 11:10:56 -07:00
Amith Yamasani
37fe059e79 Merge "Fix crash on settings launch in secondary user." 2014-04-30 18:03:03 +00:00
Amith Yamasani
a97089d389 Fix crash on settings launch in secondary user. 
Bug: 14403545

Make sure the tile wasn't already removed for other reasons.

Change-Id: Ia2b5528c01dbfba4919afaf8352e45db9ef345c3
 2014-04-30 10:58:09 -07:00
Amith Yamasani
9d9bb5af16 Merge "Fix crash when adding account" 2014-04-30 17:48:29 +00:00
Amith Yamasani
f5b3f3b445 Fix crash when adding account 
Remove the listener in onStop(), to be symmetrical with onStart().

Bug: 14393261
Change-Id: I5d4f0ca38d5ef52b97715b8f3791ff2a400c68e2
 2014-04-30 10:38:56 -07:00
The Android Automerger
dbe0b221f2 merge in master-release history after reset to 3252d1cd3a 2014-04-30 05:51:15 -07:00
Bill Yi
731f9f5f37 am c8883585: am a3860afc: Merge commit \'36a1bbe89025341987df0e380982cfbb4d09fe30\' into HEAD 
* commit 'c88835851d57fda27608822ed2cd4ffdb87292fb':
 2014-04-30 12:50:28 +00:00
John Spurlock
3252d1cd3a Merge "Add condition provider access to settings." 2014-04-30 02:12:21 +00:00
Bill Yi
c88835851d am a3860afc: Merge commit \'36a1bbe89025341987df0e380982cfbb4d09fe30\' into HEAD 
* commit 'a3860afcb5a28971a223f201a17f2583c1109704':
 2014-04-30 00:59:39 +00:00
John Spurlock
c9afadb04b Add condition provider access to settings. 
Pull NotificationAccessSettings out into a reusable base class
and reuse all of it for a new condition providers settings page.

As with notification listeners, the entire section is hidden if
no apps provide conditions.

Change-Id: Ib5273f3362e392d99647347c23a514e4590f7ac9
 2014-04-29 20:21:08 -04:00
Baligh Uddin
46900881d6 Merge "Import translations. DO NOT MERGE" 2014-04-29 21:05:54 +00:00
Dianne Hackborn
211c2cc36d Merge "Update battery charge/drain label." 2014-04-29 20:42:51 +00:00
Bill Yi
a3860afcb5 Merge commit '36a1bbe89025341987df0e380982cfbb4d09fe30' into HEAD 2014-04-29 11:34:27 -07:00
Dianne Hackborn
525f2bdfd2 Update battery charge/drain label. 
Match UX spec.

Change-Id: If1408458d488ac2ae3a63449e44ff18fc56e08d5
 2014-04-29 11:24:06 -07:00
The Android Automerger
a4bcddc7f9 merge in master-release history after reset to a0ceb908bf 2014-04-29 05:50:57 -07:00
John Spurlock
ebdc9c3596 Fix settings crash during pathological rotate. 
Bug:14281882
Change-Id: If30a3e8eea35564853fc12c03f8ab63c258310c9
 2014-04-28 17:24:30 -07:00
John Spurlock
a0ceb908bf Merge "Add zen-mode exit condition dialog to settings." 2014-04-29 00:09:53 +00:00
John Spurlock
623a0e9f45 Add zen-mode exit condition dialog to settings. 
Change-Id: I7e0f06e681d5c198ae23eaafaa4498939e6453d8
 2014-04-28 19:25:41 -04:00
Baligh Uddin
bfb44cd5b7 Import translations. DO NOT MERGE 
Change-Id: I95f6438b5e025b17ec95beb5ff5595d428be22b8
Auto-generated-cl: translation import
 2014-04-28 12:39:38 -07:00
John Spurlock
3dc6bec751 Merge "Fix settings crash during pathological rotate." 2014-04-28 19:31:02 +00:00
John Spurlock
33e784d979 Fix settings crash during pathological rotate. 
Bug:14281882
Change-Id: If30a3e8eea35564853fc12c03f8ab63c258310c9
 2014-04-28 15:28:37 -04:00
Jeff Davidson
0d66720788 Merge "Fix wording of debug log statement." 2014-04-28 19:13:26 +00:00
Dianne Hackborn
d30acb2eaf Merge "New preference for selecting new voice interaction service." 2014-04-28 18:28:17 +00:00
Dianne Hackborn
df7e99b733 New preference for selecting new voice interaction service. 
This is currently in addition to the existing Voice Search
preference in this UI.  Eventually it will replace that one,
as a superset of its functionality.

Change-Id: I26f1220fa129870cad3ec4152a569a9c494971fb
 2014-04-28 11:25:23 -07:00
Jeff Davidson
461d9d0b0f Fix wording of debug log statement. 
Change-Id: I59f47dcb9d92b32ab38a7f473b020de9d399d932
 2014-04-28 11:23:13 -07:00
Jeff Sharkey
dfd550097f Merge "Disable regulatory info directly, not priority." 2014-04-28 16:39:02 +00:00
Jeff Sharkey
696355a125 Merge "Settings app usually provides regulatory info." 2014-04-28 16:38:38 +00:00
Jeff Sharkey
3daa259d80 Disable regulatory info directly, not priority. 
Instead of using priority, offer to launch anyone handling the
action, and use the boolean to control if Settings offers the UI.

Bug: 13340779
Change-Id: Idb3f85c434414911f8911b7511b3a7a8029a8e06
 2014-04-28 08:55:12 -07:00
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