PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,910 Commits 1 Branch 0 Tags
03ce3de81efd6f98b89e7a596b8f1c00e9499d9a
Commit Graph

12910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wei Wang
17d2124c1c Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
This reverts commit eb56b9ccb8.

Conflicts:
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java

Change-Id: I2ce6b9eb0e335ba1b9aa4e1cb61a041f00d9aa87
 2014-03-03 11:18:21 -08:00
Tom O'Neill
ee4f84b0fb Merge "Ignore any summary provided for injected settings" 2014-03-03 18:49:42 +00:00
Tom O'Neill
34501ae258 Ignore any summary provided for injected settings 
Bug: 13279850
Change-Id: I1e5a39c9542b3121835f61cd0ce82612c7948cd7
 2014-03-03 10:17:52 -08:00
Fabrice Di Meglio
947d8143b9 Merge "Fix Fragment BackStack and Titles" 2014-03-03 18:01:19 +00:00
Chris Wren
2ce3443984 Merge "rename heads up global setting: app part" 2014-03-03 15:26:01 +00:00
The Android Automerger
3727a6dde1 merge in master-release history after reset to master 2014-03-02 05:49:32 -08:00
Matthew Xie
7f36c272c4 Merge "Update context on resume calls for BluetoothAdvertisingEnabler and BluetoothEnabler" 2014-03-01 22:20:34 +00:00
Chris Wren
18765d7094 rename heads up global setting: app part 
Bug: 13208692
Depends-On: Ia020e4d63552ab4b8cbb8a37622c36776800a790
Change-Id: I73755ea40d7e741e9036a245bd9c70c976aeef1a
 2014-03-01 10:36:01 -05:00
The Android Automerger
9ea6dddee0 merge in master-release history after reset to master 2014-03-01 05:51:09 -08:00
Chris Wren
f7890677df Merge "add a setting for the heads up: app part" 2014-03-01 00:06:55 +00:00
John Spurlock
5ae9ef25c6 Merge "Zen mode configuration panel. (packages/apps/Settings)" 2014-02-28 23:04:29 +00:00
John Spurlock
7243806345 Zen mode configuration panel. (packages/apps/Settings) 
Read-only version of the configuration screen for
Limited Interruptions.  Defaults to the logic implemented
for this mode, namely block notifications except for
Calls & Alarms.

This settings panel will serve as a target for the
configure affordance in SystemUI.

Change-Id: I33fd1e11ab76dbb7044bb94cb096cd892945947d
 2014-02-28 17:44:40 -05:00
Chris Wren
ad1b7eb398 add a setting for the heads up: app part 
Bug: 13208692
Depends-On: I6847f7a5f275aee2f608de0237dab0e45c39b33f
Change-Id: Ia410a473492aa7637449ba5a5dc068f98618ad03
 2014-02-28 17:19:00 -05:00
rich cannings
9f1014a772 Legal and strings approved verify apps summary 
Change-Id: Iec9dd6ec7eb4b90862021fc870235848723a2e31
 2014-02-28 09:56:53 -08:00
Dianne Hackborn
0f9ab45376 Merge "Show new radio active times." 2014-02-28 02:03:16 +00:00
Fabrice Di Meglio
8eb3f0fbf2 Fix Fragment BackStack and Titles 
Related to bug #12939786 and bug #13223838

- first use Fragment BreadCrumb for managing Titles and Back
- consider the first fragment as the initial one (both in the
normal case and in the shortcut one)
- fix usage of the Fragment BackStack so that in all cases we
are returning to the initial Fragment before exiting the App.

Change-Id: I96989d14f4e88688747b93ab9fadd96aea214a2c
 2014-02-27 16:51:06 -08:00
Matthew Xie
47c5e9c831 am 31df7cdc: am b1140053: am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946" 
* commit '31df7cdcb31993c4c62bd1995af72fca57946e10':
  HTML injection fix for bluetooth pairing, issue 65946
 2014-02-27 21:46:26 +00:00
Matthew Xie
31df7cdcb3 am b1140053: am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946" 
* commit 'b1140053057ab62cfe1bd766baa01a979739a407':
  HTML injection fix for bluetooth pairing, issue 65946
 2014-02-27 21:42:47 +00:00
Matthew Xie
b114005305 am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946" 
* commit '85fb88ee10c6bb901d30e50038b4a86252ff8c68':
  HTML injection fix for bluetooth pairing, issue 65946
 2014-02-27 21:39:34 +00:00
Matthew Xie
85fb88ee10 Merge "HTML injection fix for bluetooth pairing, issue 65946" 2014-02-27 21:32:52 +00:00
John Spurlock
adda1b0022 Zen mode settings. 
Step 1: Surface zen mode value under sound settings.

This is in keeping with the principle that quick settings are
accelerators (not replacements) for settings in the Settings app.

Adding configuration to "Limited interruptions" will be done as
a followup, and will serve as the target for the configuration
icon in SystemUI.

Change-Id: Ia2c7351454b17df3e27926ff593eebff284ebef8
 2014-02-27 15:43:40 -05:00
Rob Fletcher
7b0686af2f HTML injection fix for bluetooth pairing, issue 65946 
During bluetooth pairing, HTML injection is possible via the device name displayed to the user. This escapes the device name, before creating HTML from it, so it will preserve things like < and > but will not affect rendering of HTML

Bug: 12976386
Change-Id: I8a02d3be8c1a779dc9ed1c9ef8083a1159ab3f2b
 2014-02-27 19:46:12 +00:00
The Android Automerger
586b195274 merge in master-release history after reset to master 2014-02-27 05:50:35 -08:00
Narayan Kamath
76dcc66f4a am c7bcddaa: am 729c83a4: am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 
* commit 'c7bcddaa5ad2d6184ba296f53ed3c83f8f98f2b7':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
 2014-02-27 12:09:00 +00:00
Narayan Kamath
c7bcddaa5a am 729c83a4: am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 
* commit '729c83a4f8d7bdd02de2c9c3be1243985b042d5d':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
 2014-02-27 12:06:36 +00:00
Narayan Kamath
729c83a4f8 am 7f1c81b7: Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 
* commit '7f1c81b7b58a6a938494ed8f06d9fcf915226ba1':
  Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."
 2014-02-27 12:05:07 +00:00
Narayan Kamath
7f1c81b7b5 Merge "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED."" 2014-02-27 12:00:22 +00:00
Narayan Kamath
9ebc27c73e Revert "Set 24 hour pref. with ACTION_TIME_CHANGED." 
This reverts commit d5d9d37361.

Change-Id: I76eeb6f95a4cbbd241db1fb90528b4d91ddf7707
 2014-02-27 12:00:08 +00:00
Narayan Kamath
8e09112517 am a5fbf748: am ef3a0be9: am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED." 
* commit 'a5fbf748c1c92e5dd7ec69de71ed9bf371c11d19':
  Set 24 hour pref. with ACTION_TIME_CHANGED.
 2014-02-27 11:53:32 +00:00
Narayan Kamath
a5fbf748c1 am ef3a0be9: am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED." 
* commit 'ef3a0be922618334645b7f9b5e3ab719f3578b92':
  Set 24 hour pref. with ACTION_TIME_CHANGED.
 2014-02-27 11:50:09 +00:00
Narayan Kamath
ef3a0be922 am 14b0da74: Merge "Set 24 hour pref. with ACTION_TIME_CHANGED." 
* commit '14b0da749c73c1e0201adee1b398a1955b7d624e':
  Set 24 hour pref. with ACTION_TIME_CHANGED.
 2014-02-27 11:46:48 +00:00
Narayan Kamath
14b0da749c Merge "Set 24 hour pref. with ACTION_TIME_CHANGED." 2014-02-27 11:42:11 +00:00
Dianne Hackborn
3c741d2be8 Show new radio active times. 
Change-Id: Id3b2d072df87dce5312a1e7b7d6a0012a1b5b19a
 2014-02-26 15:53:47 -08:00
Baligh Uddin
273eebf1d6 Import translations. DO NOT MERGE 
Change-Id: I2150ccd0a7620d9282f2944c648806eff6942b8c
Auto-generated-cl: translation import
 2014-02-26 12:16:03 -08:00
The Android Automerger
92266ca7e7 merge in master-release history after reset to master 2014-02-26 09:59:37 -08:00
The Android Automerger
0df4a4799c merge in master-release history after reset to master 2014-02-26 05:50:18 -08:00
Narayan Kamath
d5d9d37361 Set 24 hour pref. with ACTION_TIME_CHANGED. 
Sent as a boolean extra EXTRA_TIME_PREF_24_HOUR_FORMAT.

Change-Id: I7fbd59eacdeb298d046da950d7045f0bab53b462
 2014-02-26 13:43:32 +00:00
Fabrice Di Meglio
167f82de3a Merge "Fix bug #13140648 Settings needs to support the new Quantum Paper theme" 2014-02-25 22:31:06 +00:00
Fabrice Di Meglio
0e2f949c90 Fix bug #13140648 Settings needs to support the new Quantum Paper theme 
Second pass:

- use Theme Holo for the Drawer too
- add a temporary background for Drawer icons (so that they dont mix
with the Drawer background)
- remove the "More..." icon as it was not needed

This CL will show that there is a discrepancy into the Drawer icons
size (some are smaller than the standard size, some other bigger).

This issue will be fixed when the new set of Icons will be delivered
by the UX team.

Change-Id: I431882df9b98157e98a1b735f31d9e77ef846767
 2014-02-25 14:26:27 -08:00
Dianne Hackborn
9050c57707 Merge "Rename unaccounted to unknown." 2014-02-25 19:08:09 +00:00
Fabrice Di Meglio
5b845d0ad7 Merge "Fix bug #13167668 stability-sys: Java crash in com.android.settings: ...java.lang.RuntimeException: Unable to destroy activity {com.android.settings/ com.android.settings.Settings}: java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState" 2014-02-25 17:54:07 +00:00
Fabrice Di Meglio
a90ecd775e Merge "Implement Holo Light Theme for Settings" 2014-02-25 17:53:05 +00:00
Baligh Uddin
1a666ff6e0 Merge "Import translations. DO NOT MERGE" 2014-02-25 17:21:04 +00:00
The Android Automerger
2335ddc954 merge in master-release history after reset to master 2014-02-25 05:50:35 -08:00
Fabrice Di Meglio
90f7a6e06e Fix bug #13167668 stability-sys: Java crash in com.android.settings: 
...java.lang.RuntimeException: Unable to destroy activity {com.android.settings/
com.android.settings.Settings}: java.lang.IllegalStateException:
Can not perform this action after onSaveInstanceState

- revert the change that was done by

https://googleplex-android-review.git.corp.google.com/#/c/148273/2

Also the OnItemClickListener has been changed since that time to cope
with the initial issue.

Change-Id: I0e3a44e6340f5576bb0f46d5a6c6a5824a44b406
 2014-02-24 18:37:06 -08:00
Dianne Hackborn
8969f615f8 Rename unaccounted to unknown. 
Change-Id: I8071c3046c69a5f513cfbec12bc0b8628194b30d
 2014-02-24 18:16:12 -08:00
Alan Viverette
061333c26b Remove toggle switch on accessibility preference fragment detach 
BUG: 13169998
Change-Id: Id6bac95feb53fec7bb56e6af5c7f5e407e8eba55
 2014-02-24 17:57:44 -08:00
Baligh Uddin
3c73af873c Import translations. DO NOT MERGE 
Change-Id: I1a0074c2f477113546c82437d8f07d43906cc859
Auto-generated-cl: translation import
 2014-02-24 13:29:09 -08:00
Fabrice Di Meglio
dca2806a23 Implement Holo Light Theme for Settings 
... and use Holo (Dark) Theme for the Drawer as requested by UX

Also remove the Wi-Fi and Bluetooth switches in the Drawer per
following UX specification.

Change-Id: I4fc17481255b5db337a887033bc831ded0d2d701
 2014-02-24 13:03:32 -08:00
Dan Sandler
a6af10f82b Merge "Settings>Security>Show notifications (on the lockscreen)." 2014-02-24 18:38:12 +00:00