PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,795 Commits 1 Branch 0 Tags
9a18c6ff18f8638a83874fcba749cd12beab74c2
Commit Graph

8795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
9a18c6ff18 am 5dff2acd: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '5dff2acddaab4a99b2b752c5f7ce00cba3c5705f':
 2012-10-11 08:11:29 -07:00
The Android Open Source Project
5dff2acdda Reconcile with jb-mr1-release - do not merge 
Change-Id: I392d116e42fa2428a2389d12995a79bc282559f5
 2012-10-11 08:06:03 -07:00
The Android Automerger
02e209a93e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-11 07:04:18 -07:00
The Android Open Source Project
861c4229ae am 9a6b238a: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '9a6b238aae5ca1554ce9b6a08d7d9dfb7e66de16':
 2012-10-11 06:02:13 -07:00
The Android Open Source Project
9a6b238aae Reconcile with jb-mr1-release - do not merge 
Change-Id: Icba100b3a0655cdcdabfa2e162af28c943a15c7e
 2012-10-11 05:57:58 -07:00
Amith Yamasani
7ce98e0dac am 3021168d: am 01f76885: am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev 
* commit '3021168d06bb891f38b212d3338e8397b898b25d':
  Fix crash in Settings for secondary users
 2012-10-10 22:32:02 -07:00
Amith Yamasani
3021168d06 am 01f76885: am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev 
* commit '01f7688555377feeced5da19129ea5c04505d279':
  Fix crash in Settings for secondary users
 2012-10-10 22:29:42 -07:00
Amith Yamasani
01f7688555 am 4465bbb7: Merge "Fix crash in Settings for secondary users" into jb-mr1-dev 
* commit '4465bbb7e14020e10620cda70fc51896b57ced67':
  Fix crash in Settings for secondary users
 2012-10-10 22:28:19 -07:00
Amith Yamasani
4465bbb7e1 Merge "Fix crash in Settings for secondary users" into jb-mr1-dev 2012-10-10 22:27:04 -07:00
Baligh Uddin
2e4b2ec1ef am 78df9396: (-s ours) am 55dba5ea: am 73d49b3b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '78df93961fe6c260e7dd0b3f344ca0e37097d0fe':
  Import translations. DO NOT MERGE
 2012-10-10 21:53:01 -07:00
Baligh Uddin
78df93961f am 55dba5ea: am 73d49b3b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '55dba5ea08166a09c04dc2b6da706a6e4c358949':
  Import translations. DO NOT MERGE
 2012-10-10 21:50:42 -07:00
Baligh Uddin
c4099c4d28 am 2f8f48ca: (-s ours) am 69d8b40c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '2f8f48ca705181e8601cd79b6d5c7cdaa46e917c':
  Import translations. DO NOT MERGE
 2012-10-10 21:50:17 -07:00
Baligh Uddin
55dba5ea08 am 73d49b3b: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '73d49b3bd996f38115ea47a51d54241aee55e9de':
  Import translations. DO NOT MERGE
 2012-10-10 21:49:07 -07:00
Baligh Uddin
2f8f48ca70 am 69d8b40c: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '69d8b40c9da3587e0287296ca6609a125d950332':
  Import translations. DO NOT MERGE
 2012-10-10 21:49:02 -07:00
Baligh Uddin
2653050747 Merge "Import translations. DO NOT MERGE" 2012-10-10 21:48:59 -07:00
Baligh Uddin
73d49b3bd9 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-10 21:47:57 -07:00
Baligh Uddin
69d8b40c9d Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-10 21:47:05 -07:00
Amith Yamasani
b99f864d3f Fix crash in Settings for secondary users 
Bug: 7328485

Change-Id: If766d1f28f48fb1853ea64c2b2a9294df9bcf22b
 2012-10-10 21:44:15 -07:00
Jeff Sharkey
26efca3cc6 am 58288c43: am f4e7417e: am 84b90d53: Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev 
* commit '58288c43eca41e93b7e183802cedca920b44055f':
  Switch to IPackageManager.getServiceInfo().
 2012-10-10 17:23:28 -07:00
Jeff Sharkey
5a317d7e3e am c2a47691: am 631c0bde: am 2264a643: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit 'c2a4769197a520e36d2cfe6911f669ee1a9bb63c':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 17:23:04 -07:00
Jeff Sharkey
58288c43ec am f4e7417e: am 84b90d53: Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev 
* commit 'f4e7417e69e19e647ac95ea5abd90892659a9ae9':
  Switch to IPackageManager.getServiceInfo().
 2012-10-10 17:03:51 -07:00
Jeff Sharkey
f4e7417e69 am 84b90d53: Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev 
* commit '84b90d533275be792954efc37e14f0c8fd409681':
  Switch to IPackageManager.getServiceInfo().
 2012-10-10 17:01:49 -07:00
Jeff Sharkey
84b90d5332 Merge "Switch to IPackageManager.getServiceInfo()." into jb-mr1-dev 2012-10-10 16:59:48 -07:00
Jeff Sharkey
c2a4769197 am 631c0bde: am 2264a643: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '631c0bde1041c271de7aebc2842eba4796bb5f4b':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 16:31:05 -07:00
Jeff Sharkey
631c0bde10 am 2264a643: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 
* commit '2264a64331b39b0770b72a71a453601cc1b9b9ac':
  Move lockscreen to using haptic feedback setting.
 2012-10-10 16:29:36 -07:00
Jeff Sharkey
2264a64331 Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev 2012-10-10 16:27:27 -07:00
Jeff Sharkey
0e092f4eb0 Switch to IPackageManager.getServiceInfo(). 
Bug: 7095093
Change-Id: I79b9f077c9d69c5629b7dd0071a11ccda50839cd
 2012-10-10 16:20:46 -07:00
Dianne Hackborn
6f5f824cd1 am bc33d43c: am a2638d3e: am af0cea0a: Merge "Fix issue #7318666: hide developer options from user build" into jb-mr1-dev 
* commit 'bc33d43cc175fdbbe096729617a731a99de9ecc2':
  Fix issue #7318666: hide developer options from user build
 2012-10-10 15:59:15 -07:00
Dianne Hackborn
bc33d43cc1 am a2638d3e: am af0cea0a: Merge "Fix issue #7318666: hide developer options from user build" into jb-mr1-dev 
* commit 'a2638d3e0ea32d5d36a8a2bf7d82ff7b6adec4e3':
  Fix issue #7318666: hide developer options from user build
 2012-10-10 15:57:16 -07:00
Dianne Hackborn
a2638d3e0e am af0cea0a: Merge "Fix issue #7318666: hide developer options from user build" into jb-mr1-dev 
* commit 'af0cea0a2148f8915a57c50a571636911feed9d3':
  Fix issue #7318666: hide developer options from user build
 2012-10-10 15:55:22 -07:00
Dianne Hackborn
af0cea0a21 Merge "Fix issue #7318666: hide developer options from user build" into jb-mr1-dev 2012-10-10 15:53:57 -07:00
Jeff Sharkey
e656031ff8 Move lockscreen to using haptic feedback setting. 
This removes lockscreen-specific "Vibrate on touch" setting, and
changes it to use the haptic feedback setting instead.

Bug: 7318772
Change-Id: Id6931903b3ebeca6aeacef9b127490a381cd40b4
 2012-10-10 15:38:58 -07:00
Baligh Uddin
3becdfb6bf Import translations. DO NOT MERGE 
Change-Id: Icfe984470ee5be51cf54ffd245936e10dcae7913
Auto-generated-cl: translation import
 2012-10-10 15:30:50 -07:00
Baligh Uddin
2625b9c106 Import translations. DO NOT MERGE 
Change-Id: I9dbc7f4fa1f07b43c24be35b63f5dafe24876a61
Auto-generated-cl: translation import
 2012-10-10 15:28:23 -07:00
Baligh Uddin
1e42f2a2e9 Import translations. DO NOT MERGE 
Change-Id: I3f206ba064e3ec18bc583ca62acc69324d16bf71
Auto-generated-cl: translation import
 2012-10-10 15:26:51 -07:00
Dianne Hackborn
caefa9b5f0 Fix issue #7318666: hide developer options from user build 
Change-Id: I4c5a66bd5f4d3fc36d439228a7a276d694291606
 2012-10-10 15:05:42 -07:00
Jeff Sharkey
7d20d459a7 am 2737b449: am 2a6f2511: am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev 
* commit '2737b4492e20a92700f54209de55f8bae2c401f0':
  Use user-specific PackageManager.
 2012-10-10 14:34:14 -07:00
Jeff Sharkey
2737b4492e am 2a6f2511: am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev 
* commit '2a6f25115feeb66f8cf1ea06524a7496cb9c3037':
  Use user-specific PackageManager.
 2012-10-10 14:32:34 -07:00
Jeff Sharkey
2a6f25115f am 33080be2: Merge "Use user-specific PackageManager." into jb-mr1-dev 
* commit '33080be20a58d340f860feed444167edb527d689':
  Use user-specific PackageManager.
 2012-10-10 14:30:30 -07:00
Jeff Sharkey
33080be20a Merge "Use user-specific PackageManager." into jb-mr1-dev 2012-10-10 14:29:08 -07:00
Svetoslav Ganov
b815878f2c am 283291b7: am ec994cd7: am 289a3396: Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev 
* commit '283291b78982604690e4150b5f6cab9a2bbcfc1e':
  Accessibility enabled by gesture not reflected in settings screen.
 2012-10-10 14:24:23 -07:00
Svetoslav Ganov
283291b789 am ec994cd7: am 289a3396: Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev 
* commit 'ec994cd777d7102ff6d1e752552ef75515049f89':
  Accessibility enabled by gesture not reflected in settings screen.
 2012-10-10 14:22:20 -07:00
Svetoslav Ganov
ec994cd777 am 289a3396: Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev 
* commit '289a3396291f05d8ffb6adeabbf935d9e75203b1':
  Accessibility enabled by gesture not reflected in settings screen.
 2012-10-10 14:20:01 -07:00
Svetoslav Ganov
289a339629 Merge "Accessibility enabled by gesture not reflected in settings screen." into jb-mr1-dev 2012-10-10 14:16:50 -07:00
The Android Automerger
e55eb8136e merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-10 14:07:00 -07:00
Svetoslav Ganov
849d64bc1d Accessibility enabled by gesture not reflected in settings screen. 
1. We have added a global gesture to enable accessibility which is long press
   on power followed by a long press with two fingers. If this gesture is
   performed when the settings for an accessibility service are on the screen,
   accessibility and the screen-reader are enabled while the UI does not reflect
   that and the user may try to enable the already enabled screen-reader which
   will show two irrelevant warning dialogs - one for enabling the screen-reader
   and one for enabling explore by touch (assuming the screen-reader requests it).
   This change adds a simple content observer for the relevant accessibility
   settings which upon a change calls the functions to refresh the settings UI.

bug:7309127

Change-Id: I214c64877086eeb1fe156bcc195aa4e2931d6bdb
 2012-10-10 13:50:40 -07:00
Adam Powell
0bba3a4bd2 am 3686b02a: am 2b383419: am 68dac84c: Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev 
* commit '3686b02afe0953b84692721c1f9cc745d4797f58':
  Fix padding for PagerTabStrip on large screen devices
 2012-10-10 13:19:17 -07:00
Adam Powell
3686b02afe am 2b383419: am 68dac84c: Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev 
* commit '2b383419b9da3857347b9656c3fda8e23ef29ee5':
  Fix padding for PagerTabStrip on large screen devices
 2012-10-10 13:17:00 -07:00
Adam Powell
2b383419b9 am 68dac84c: Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev 
* commit '68dac84c4133b91db87642743f30657604a4fb77':
  Fix padding for PagerTabStrip on large screen devices
 2012-10-10 13:15:09 -07:00
Adam Powell
68dac84c41 Merge "Fix padding for PagerTabStrip on large screen devices" into jb-mr1-dev 2012-10-10 13:13:42 -07:00