PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,996 Commits 1 Branch 0 Tags
1f5bcc18d29fe9d74e43655bf6ed9c55ee5e9c8e
Commit Graph

15996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
12997ecd97 am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev 
* commit '99ad06c2a15200cfd83da7cf2131c8127f55544c':
  Change the location mode before applying restrictions
 2014-09-03 16:42:29 +00:00
Dan Sandler
afe7e998b0 am 148d9428: am b58b5127: Fix links to notification settings activities. 
* commit '148d9428bc4eb5d5d3e818b250c1de52d98f9e68':
  Fix links to notification settings activities.
 2014-09-03 16:29:06 +00:00
Dan Sandler
148d9428bc am b58b5127: Fix links to notification settings activities. 
* commit 'b58b5127040b3c843fe42544a89a1085cf7e74f6':
  Fix links to notification settings activities.
 2014-09-03 16:19:25 +00:00
Dan Sandler
b58b512704 Fix links to notification settings activities. 
Additionally, we now show the user a list of "app-like"
things (packages with launchable activities) instead of only
non-system things. This way you can make (some) changes to
system package notifications while not having to page
through reams of random non-app packages.

Bug: 17277023
Change-Id: I920d6b941070efb75a816e6ad38b798b09a83d08
 2014-09-03 16:37:51 +02:00
Vinit Deshpande
621bfb35ba am 7b3a67b3: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '7b3a67b369a1a444eb4eb9c1424aa82dc2830d45':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 14:33:32 +00:00
Amith Yamasani
6014b940af am b1de932e: am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev 
* commit 'b1de932ec6c5b3d59b8181701b34b5346beda437':
  Change the location mode before applying restrictions
 2014-09-03 14:33:31 +00:00
PauloftheWest
de29d04fae Fixed an issue were "Saved Networks" would not appear correctly. 
Bug: 17284538
Change-Id: Id93cd93f94a59437b04d41d4b0412d3b22575e17
 2014-09-03 05:42:14 -07:00
Alexandra Gherghina
e529bb9841 Code clean-ups following moving the managed profile under accounts 
Bug: 16234745
Change-Id: I7b4799157394a85a27610de7e059c846f77dda02
 2014-09-03 11:01:45 +01:00
Wink Saville
d857104325 Prepare to make SubscriptionManager public. 
Sync SubscriptionManager and its dependentes between lmp-dev
and lmp-sprout-dev.

Change-Id: Ie06ced3e7ff5a3d06b3b47892fed22b4bb8972c7
 2014-09-02 22:46:42 -07:00
PauloftheWest
ef895ed21e am 5029b7a9: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit '5029b7a90c083d2128d09d34e9d32f1b89a14488':
  Fixed a crash when loading Bluetooth Settings.
 2014-09-03 05:07:29 +00:00
Fabrice Di Meglio
14be7d23a2 Fix bug #17208479 Have Cellular Networks Show up in Data Usage 
- prevent collisions in the DocId (which is the primary key of
the FTS4 table)
- instead of just using "updatedTitle" hash, use instead
"updatedTitle + screenTitle"

Change-Id: If38f7bcc7fb857d59242d08c16c39adb80590254
 2014-09-02 18:31:10 -07:00
Vinit Deshpande
7b3a67b369 am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 
* commit '963ce47525144879d295b5f54b04225220f74866':
  Address API Council feedback for WifiAdapter/WPS APIs
 2014-09-03 01:03:06 +00:00
Amith Yamasani
b1de932ec6 am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev 
* commit '99ad06c2a15200cfd83da7cf2131c8127f55544c':
  Change the location mode before applying restrictions
 2014-09-03 01:03:05 +00:00
Vinit Deshpande
963ce47525 Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev 2014-09-03 00:59:57 +00:00
Amith Yamasani
99ad06c2a1 Merge "Change the location mode before applying restrictions" into lmp-dev 2014-09-03 00:56:28 +00:00
Amith Yamasani
92c5452f08 Change the location mode before applying restrictions 
Once the location sharing restriction is applied, the setting cannot
be changed, so change the setting first.

Bug: 17348894
Change-Id: I9dcad230e816aaa2482f1f35f1993f51d14eabc7
 2014-09-02 17:48:31 -07:00
PauloftheWest
43454701c6 am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit 'ebe496ea7b18c5d702db4beee270046e43e491ad':
  Fixed a crash when loading Bluetooth Settings.
 2014-09-02 21:38:49 +00:00
PauloftheWest
5029b7a90c am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 
* commit 'ebe496ea7b18c5d702db4beee270046e43e491ad':
  Fixed a crash when loading Bluetooth Settings.
 2014-09-02 21:38:29 +00:00
PauloftheWest
ebe496ea7b Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev 2014-09-02 21:31:23 +00:00
PauloftheWest
dba078fe86 Fixed a crash when loading Bluetooth Settings. 
Bug: 17320674
Change-Id: Ibff0b5929b88b1a48c1fdd810fd8461bdb5f1274
 2014-09-02 14:24:38 -07:00
Jason Monk
797f3c4853 am 8069392f: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev 
* commit '8069392f8e0aecaa028eb0b90376a210cab028fe':
  Bring back auto-rotate to settings
 2014-09-02 20:25:57 +00:00
Jason Monk
c8d9504eea am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev 
* commit 'dc4818ab7aa959143a1eb0b88bf0a4c9e6d19380':
  Bring back auto-rotate to settings
 2014-09-02 20:14:20 +00:00
Jason Monk
8069392f8e am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev 
* commit 'dc4818ab7aa959143a1eb0b88bf0a4c9e6d19380':
  Bring back auto-rotate to settings
 2014-09-02 20:14:09 +00:00
Jason Monk
dc4818ab7a Merge "Bring back auto-rotate to settings" into lmp-dev 2014-09-02 20:04:35 +00:00
Paul Lawrence
23eeb0996f am bde3efa0: am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev 
* commit 'bde3efa0617f458fa86c3adbdd8e75956872eccf':
  Get correct factory reset reason from encryption failure
 2014-09-02 19:54:19 +00:00
Jason Monk
d3232da75a Bring back auto-rotate to settings 
Add a dropdown preference to the display settings screen that
controls whether auto-rotate is on.

Bug: 16636008
Change-Id: I71099a23793aa82b514bd0eebae183695415a92c
 2014-09-02 15:46:08 -04:00
Paul Lawrence
bde3efa061 am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev 
* commit '1f06a89f468d7998a271b49dfbbdd7ea1f5b01a3':
  Get correct factory reset reason from encryption failure
 2014-09-02 19:46:00 +00:00
Paul Lawrence
8826a64a6c am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev 
* commit '1f06a89f468d7998a271b49dfbbdd7ea1f5b01a3':
  Get correct factory reset reason from encryption failure
 2014-09-02 19:44:56 +00:00
Paul Lawrence
1f06a89f46 Merge "Get correct factory reset reason from encryption failure" into lmp-dev 2014-09-02 19:33:25 +00:00
Maurice Lam
e3b7f5aa5e am 3b609ffb: am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev 
* commit '3b609ffb91238beadda2a7edf4ab1b575aa9d3bd':
  [WifiSetup] Add shadow below header
 2014-09-02 19:18:45 +00:00
Maurice Lam
3b609ffb91 am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev 
* commit 'def48d605abe4fe597dbcea5e7c2f9ca93f1b237':
  [WifiSetup] Add shadow below header
 2014-09-02 19:03:00 +00:00
Maurice Lam
8efe92789e am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev 
* commit 'def48d605abe4fe597dbcea5e7c2f9ca93f1b237':
  [WifiSetup] Add shadow below header
 2014-09-02 19:01:46 +00:00
Maurice Lam
def48d605a Merge "[WifiSetup] Add shadow below header" into lmp-dev 2014-09-02 18:51:36 +00:00
PauloftheWest
00a0f7351a am de6af9c2: am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 
* commit 'de6af9c2876c6a42cef7f34b95896f4ddf650d8a':
  Fixed a Null Pointer Exception when Wifi Settings is indexing.
 2014-09-02 18:44:09 +00:00
PauloftheWest
de6af9c287 am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 
* commit 'bde55601ba5695894b7f9b8c7f61fd6694f9b459':
  Fixed a Null Pointer Exception when Wifi Settings is indexing.
 2014-09-02 18:28:54 +00:00
PauloftheWest
9fef5db88e am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 
* commit 'bde55601ba5695894b7f9b8c7f61fd6694f9b459':
  Fixed a Null Pointer Exception when Wifi Settings is indexing.
 2014-09-02 18:27:20 +00:00
Paul Lawrence
87abbd3ea0 Get correct factory reset reason from encryption failure 
Requires matching framework change
https://googleplex-android-review.git.corp.google.com/#/c/535832/

Bug: 17213613
Change-Id: Ia8006f4a9cb5909d83f1848d9acfbc3f1e0ab5fb
 2014-09-02 18:26:38 +00:00
PauloftheWest
bde55601ba Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev 2014-09-02 18:11:38 +00:00
Fabrice Di Meglio
1ef630938f am 1aaa801e: am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 
* commit '1aaa801e963352513a9ffa8c51a234c8bc69c30e':
  Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
 2014-09-02 17:35:49 +00:00
Fabrice Di Meglio
1aaa801e96 am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 
* commit 'de8c683f99b8db7289289016cf5d33016eea9dcd':
  Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
 2014-09-02 17:22:54 +00:00
Fabrice Di Meglio
8bde623e65 am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 
* commit 'de8c683f99b8db7289289016cf5d33016eea9dcd':
  Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
 2014-09-02 17:21:58 +00:00
Fabrice Di Meglio
de8c683f99 Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev 2014-09-02 17:13:42 +00:00
Dan Sandler
62927c0f44 am eee4ba73: am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 
* commit 'eee4ba73d23d07f6edb176b341e85716c4989155':
  Switch to vibrate (or slash-bell) icon at ringer volume 0.
 2014-09-02 15:52:10 +00:00
Dan Sandler
eee4ba73d2 am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 
* commit '3eac072b1ad963007211d1b13ebb6d0bb0fc24a6':
  Switch to vibrate (or slash-bell) icon at ringer volume 0.
 2014-09-02 15:40:18 +00:00
Dan Sandler
c8c5091f26 am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 
* commit '3eac072b1ad963007211d1b13ebb6d0bb0fc24a6':
  Switch to vibrate (or slash-bell) icon at ringer volume 0.
 2014-09-02 15:40:13 +00:00
Dan Sandler
3eac072b1a Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev 2014-09-02 15:32:41 +00:00
PauloftheWest
125bf2375e Fixed a Null Pointer Exception when Wifi Settings is indexing. 
Bug: 17335468
Change-Id: I85293e882d90da4a54d4690ffec32fba7101b65e
 2014-09-02 06:52:01 -07:00
PauloftheWest
367c4c5141 am b4460ad4: am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev 
* commit 'b4460ad4e6167ea2d173ccf68512568542f4b2b8':
  Updated Wifi Assistant to support RTL.
 2014-09-02 13:18:03 +00:00
PauloftheWest
a8d4b00508 am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev 
* commit 'd6cfeba9f717fe043efc56d4bdf18a18e4bb9bff':
  Updated Wifi Assistant to support RTL.
 2014-09-02 13:12:01 +00:00
PauloftheWest
b4460ad4e6 am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev 
* commit 'd6cfeba9f717fe043efc56d4bdf18a18e4bb9bff':
  Updated Wifi Assistant to support RTL.
 2014-09-02 13:12:01 +00:00