Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,338 Commits 1 Branch 0 Tags
2719eebfc5e7fcfdac417be9a4ae07e25abcaaea
Commit Graph

5343 Commits

Author SHA1 Message Date
Mark Salyzyn
3f7e5fc170 am ce258caa: Merge changes I8f067f14,I54d8255a,Ib15917bf 
* commit 'ce258caa4aa5cd1ea66b839ee7231c76fcfbc8d6':
  Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE
  Settings: logd: increase dialog title field size to 59
  Settings: logd: increase summary field size to 30
 2014-06-18 14:20:11 +00:00
Griff Hazen
3ba147712b am bd042089: DO NOT MERGE Fix build for notification listener internal api change 
* commit 'bd042089891d749855be5d39d76380e7c7f85e6f':
  DO NOT MERGE Fix build for notification listener internal api change
 2014-06-18 09:00:55 +00:00
Griff Hazen
bd04208989 DO NOT MERGE Fix build for notification listener internal api change 
Bug: 15426276
Change-Id: I3861eb03796f9938f66237454aea148f5c64b370
 2014-06-17 21:43:19 -07:00
Fabrice Di Meglio
07d976e431 Settings: crashing when turning ON<>OFF developer option. DO NOT MERGE 
- prevent NPE
- define default value (to 256K)
- add more logs for showing value which has been set or any exception

Bug: 15687210
Change-Id: I8f067f14d81ee56631d1ad74b91b5ede26cae125
 2014-06-17 10:55:20 -07:00
Mark Salyzyn
c2c64a312a am 5a9a18c1: Merge "logd: Add Developer settings for size" 
* commit '5a9a18c15b16be282ed48df0fa38045ae9016524':
  logd: Add Developer settings for size
 2014-06-13 20:27:25 +00:00
Mark Salyzyn
408c89bfb5 logd: Add Developer settings for size 
- Dependent on some logd/init/selinux security changes.

Bug: 14563261
Change-Id: I11e3aa97a0ba40c3f55041d98c02d7e73629e984
 2014-06-13 20:20:08 +00:00
Brian Carlstrom
f354290901 am 2ce0dcda: am 70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart" 
* commit '2ce0dcdad47e132dbe0f9cd16146b8e3c6b11cd6':
  Move to dalvik.vm.lib.2 to force default to libart
 2014-05-28 23:13:26 +00:00
Brian Carlstrom
2ce0dcdad4 am 70f2201c: Merge "Move to dalvik.vm.lib.2 to force default to libart" 
* commit '70f2201c7ab842df6c45a1540803239eafa267ed':
  Move to dalvik.vm.lib.2 to force default to libart
 2014-05-28 22:31:43 +00:00
Brian Carlstrom
9d7e2b1949 Move to dalvik.vm.lib.2 to force default to libart 
Bug: 14298175

(cherry picked from commit 3bc8aaad29)

Change-Id: I5c551d6d6f00af5a7b3638e3847950e441414e37
 2014-05-28 14:48:15 -07:00
Jeff Sharkey
e4dd48939d am 14f42ca9: am 110ddbfe: Merge "Fix NullPointerException issue when user change" 
* commit '14f42ca9f46d2dafaadff2b0ccef645d66679bc7':
  Fix NullPointerException issue when user change
 2014-05-09 17:45:42 +00:00
Jeff Sharkey
14f42ca9f4 am 110ddbfe: Merge "Fix NullPointerException issue when user change" 
* commit '110ddbfea0b6ba8702d3f7ba9d00c9f97c908dbb':
  Fix NullPointerException issue when user change
 2014-05-09 17:41:27 +00:00
Jeff Sharkey
110ddbfea0 Merge "Fix NullPointerException issue when user change" 2014-05-09 17:35:27 +00:00
Zhihai Xu
3cfb6885b4 am d6b0b172: am 7dd84651: Merge "Display BTH connected status correctly" 
* commit 'd6b0b1721a684be1805025908c4733a6b02794a4':
  Display BTH connected status correctly
 2014-04-30 18:28:49 +00:00
Zhihai Xu
d6b0b1721a am 7dd84651: Merge "Display BTH connected status correctly" 
* commit '7dd84651a25566c5a2152d935f19a11cebfc58ae':
  Display BTH connected status correctly
 2014-04-30 18:25:22 +00:00
Tsuyoshi Kamata
89377530c7 Display BTH connected status correctly 
This patch removes incorrect condition.
(to not use LocalBluetoothProfile#isPreferred())
This condition uses the priority that already disconnected profile,
so this codition always returns false.

To verify this issue:
1. Turn on Bluetooth.
2. Pair and connect to BTH(A2DP/HFP)
3. The display now says "Connected"
3. Disconnect HFP profile
4. The display still says "Connected" but it should say "Connected (no phone)"

Change-Id: I9e2bfa6d23bf1be7587c9556b4b05459d02c4817
 2014-04-30 18:20:55 +00:00
Bill Yi
a3860afcb5 Merge commit '36a1bbe89025341987df0e380982cfbb4d09fe30' into HEAD 2014-04-29 11:34:27 -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
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
309004706c Track MutableBoolean's new package. 
Change-Id: I96df3fcbc3b94186a36617dfc1df5b195880be13
 2014-04-23 18:04:40 -07: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
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
Wink Saville
d5b8ee9ba4 am 242184ca: Merge "Allow tablets to send SMS if enabled in device overlays (1/2)" 
* commit '242184ca23b8ef70f5347874ac9b5c59cce36208':
  Allow tablets to send SMS if enabled in device overlays (1/2)
 2014-04-16 20:26:53 +00:00
Wink Saville
242184ca23 Merge "Allow tablets to send SMS if enabled in device overlays (1/2)" 2014-04-16 20:21:57 +00:00
Adrian Roos
e63ac36f41 am 79a17924: am 0b55caf0: am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '79a179244612b09368209e2c95e48fe836aeab59':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:57:22 +00:00
Adrian Roos
79a1792446 am 0b55caf0: am a52a37b0: am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '0b55caf01af1efa15ff0bfbf50a1726fce788660':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:51:39 +00:00
Adrian Roos
a52a37b0fe am 1b0b38cf: am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '1b0b38cfeb54638899ddab48ff9198590f951a55':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:38:30 +00:00
Adrian Roos
1b0b38cfeb am 5d3c8c89: am 90630f6a: am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '5d3c8c89fca09ee190fe8df37e76ff05cc3833b1':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:35:13 +00:00
Adrian Roos
90630f6a6d am 09235d10: am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '09235d1065b501aa8a42e0767d72c15e7b846bae':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:23:57 +00:00
Adrian Roos
09235d1065 am 82b3e62a: am 4692a48c: am c4bfea20: am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '82b3e62a4f8c8a229f700bbf122b8f8854162146':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 14:17:11 +00:00
Adrian Roos
c4bfea207a am 3f38173f: am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '3f38173fadc1423d4c36b265a2ab5fdc09d88271':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 13:58:57 +00:00
Adrian Roos
3f38173fad am 3a7690b1: am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '3a7690b157c100f3a36b6fdc2578a12845875e06':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 13:55:28 +00:00
Adrian Roos
3a7690b157 am 8184ea52: Add lockout after trying to enter PIN / Password too often 
* commit '8184ea524519a67b1284266844e6e186f3a74cab':
  Add lockout after trying to enter PIN / Password too often
 2014-04-03 13:49:53 +00:00
Adrian Roos
8184ea5245 Add lockout after trying to enter PIN / Password too often 
Enforce the same lockout that is already enforced when entering the pattern.

Bug: 13647935

Change-Id: Ia60a2235ad526c293b7a8d5600f406f187004df7
 2014-04-02 16:28:10 +02:00
John Spurlock
ce1b22cf66 am c4231382: DO NOT MERGE Settings: Implement new required method. 
* commit 'c423138247857312a4ac6ad32cb482868315bd61':
  DO NOT MERGE Settings: Implement new required method.
 2014-03-28 19:01:12 +00:00
John Spurlock
c423138247 DO NOT MERGE Settings: Implement new required method. 
Only required since it uses the non-public version
of the api.

Bug:13562828
Change-Id: If1eaf070eca889f27fb1dfeef0c0f54a085246aa
 2014-03-28 09:41:30 -04:00
Wei Wang
a95228ff5b am 41f5437d: DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
* commit '41f5437def4b97581d67b5636ca2dba10f8eb385':
  DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference."
 2014-03-20 16:24:12 +00:00
Wei Wang
41f5437def DO NOT MERGE: Revert "BLE peripheral mode (4/4): Settings change for advertising preference." 
This is cherry pick from master/klp-dev changes.
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

Conflicts:
	src/com/android/settings/bluetooth/BluetoothAdvertisingEnabler.java
	src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
	src/com/android/settings/bluetooth/BluetoothSettings.java
	src/com/android/settings/bluetooth/LocalDeviceProfilesSettings.java
 2014-03-19 22:37:27 -07:00
Przemyslaw Szczepaniak
38aeec0ad8 am 6829c48c: Merge "Fix F/C in TTS settings" 
* commit '6829c48c36fceebb46989f8ee25c369fa5f7adeb':
  Fix F/C in TTS settings
 2014-03-13 23:18:44 +00:00
Alan Viverette
3782a3a6a1 am 42972075: am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 
* commit '429720754d85e1b13bc9001adaa23a0b0db04b61':
  DO NOT MERGE Add preference for caption text opacity
 2014-03-13 18:02:19 +00:00
Alan Viverette
b4a50745f2 am c736f794: am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 
* commit 'c736f794ac38b832b5ffde28502580a9b20b722b':
  DO NOT MERGE Remove extra fragment in captioning preferences
 2014-03-13 18:02:18 +00:00
Przemyslaw Szczepaniak
375545e2fe am 6829c48c: Merge "Fix F/C in TTS settings" 
* commit '6829c48c36fceebb46989f8ee25c369fa5f7adeb':
  Fix F/C in TTS settings
 2014-03-13 15:32:48 +00:00
Alan Viverette
429720754d am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity
 2014-03-13 10:01:45 +00:00
Alan Viverette
c736f794ac am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 
* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
  DO NOT MERGE Remove extra fragment in captioning preferences
 2014-03-13 10:01:42 +00:00
Shuhrat Dehkanov
f365216391 Fix F/C in TTS settings 
This is an attempt to fix uncaught MissingResourceException
that would be thrown if default language of selected engine is
set to a locale that has no 3-letter country/language code.

Please see https://code.google.com/p/android/issues/detail?id=63122

Change-Id: Iccb2a55f5f7a97819310fd888559650fe7febe4a
Signed-off-by: Shuhrat Dehkanov <k@efir.uz>
 2014-03-13 12:06:17 +09:00
Narayan Kamath
5877242019 am c776bbb1: Merge "Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""" 
* commit 'c776bbb1562b844297260790fd1a50382396a3f9':
  Revert "Revert "Set 24 hour pref. with ACTION_TIME_CHANGED.""
 2014-03-13 01:55:25 +00:00
RoboErik
0b71937d30 am 5791cecc: b/12068020 Update calls to InputManager. Do not merge 
* commit '5791cecc9e0a4169c71b87696973441071e295c8':
  b/12068020 Update calls to InputManager. Do not merge
 2014-03-12 21:12:27 +00:00
RoboErik
5791cecc9e b/12068020 Update calls to InputManager. Do not merge 
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/400419/

This is part of work on making key layouts get saved per vendor/product
instead of per device. The corresponding change in fw is
https://googleplex-android-review.git.corp.google.com/#/c/399886/
This changes all uses of InputDevice descriptor to InputDeviceIdentifier.

Change-Id: I9072c5b5c822b73188a6c572945f87b4a7c03139
 2014-03-12 12:53:46 -07:00
Alan Viverette
23d01e0b4b am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev 
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity
 2014-03-11 23:05:19 +00:00
Alan Viverette
451994bf10 am a74da813: am d43d5bec: Merge "DO NOT MERGE Remove extra fragment in captioning preferences" into klp-dev 
* commit 'a74da813ec622822c8bb8b4524439c81e8b90dfa':
  DO NOT MERGE Remove extra fragment in captioning preferences
 2014-03-11 23:05:13 +00:00