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

9998 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
fe8ebb3b18 Merge "Import translations. DO NOT MERGE" 2012-12-04 08:14:31 -08:00
Danielle Millett
9545fd802b am 949318a6: am ce50c681: am aeb199ab: Better layouts for security screen setups as part of b/7459863 
* commit '949318a6f46225b367e04e5a7acd55011ebe8ad6':
  Better layouts for security screen setups as part of b/7459863
 2012-12-04 08:11:16 -08:00
Danielle Millett
949318a6f4 am ce50c681: am aeb199ab: Better layouts for security screen setups as part of b/7459863 
* commit 'ce50c6816a205ba2e9a6867f65f6a6ee799fef56':
  Better layouts for security screen setups as part of b/7459863
 2012-12-04 08:09:49 -08:00
Danielle Millett
ce50c6816a am aeb199ab: Better layouts for security screen setups as part of b/7459863 
* commit 'aeb199ab00cb8f470a14f02fe2e67527ca72e737':
  Better layouts for security screen setups as part of b/7459863
 2012-12-04 08:08:01 -08:00
Daniel Sandler
7bed18e65f Revised language for notification ringtone picker. 
Bug: 7659273
Change-Id: Id2702881d3789447ee18530749897448306d4148
 2012-12-04 09:05:10 -05:00
Baligh Uddin
051e08bb76 Import translations. DO NOT MERGE 
Change-Id: I4b949a7ab1b917a27773fe707c2dd0830116d361
Auto-generated-cl: translation import
 2012-12-03 12:09:04 -08:00
Baligh Uddin
b37447a7aa Import translations. DO NOT MERGE 
Change-Id: Id0c38bd59bc3019d70d4c8320019ce0cb0a697ef
Auto-generated-cl: translation import
 2012-12-03 12:06:15 -08:00
Baligh Uddin
7d3bbbb0af Import translations. DO NOT MERGE 
Change-Id: Ibfe45f546221f193711cfeb4bf25ccd05c04be50
Auto-generated-cl: translation import
 2012-12-03 12:04:55 -08:00
The Android Open Source Project
538680885f am bc9e8c4a: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'bc9e8c4a63e91305fe182de414cca8220e0023c4':
 2012-12-03 11:36:45 -08:00
The Android Open Source Project
bc9e8c4a63 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I889bdeceda8d6b158a8b70596450156f5a68910f
 2012-12-03 11:34:37 -08:00
The Android Automerger
7c980ad8ed merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-03 06:07:14 -08:00
Danielle Millett
c1570e6635 am 783d0e7d: am a5ca5158: am 49562681: Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev 
* commit '783d0e7d9d2dcc05a45b2c5ec7117f61f460642d':
  Removing tutorial for choosing a pattern as part of b/7459863
 2012-11-30 19:10:32 -08:00
Danielle Millett
aeb199ab00 Better layouts for security screen setups as part of b/7459863 
The major change is that choose pattern and confirm pattern layouts
no longer uses a split screen layout on tablets.  The new layout
closely mimics the layout for portrait.
Other minor changes include:
-Made the header font size for confirm pattern and choose pattern
medium (this matches with face unlock changes).
-Made the buttons on choose pattern for landscape phone side-by-side
rather than above each other (to be consistent with face unlock).
-Removed the black background from phone landscape confirm pattern
since it's inconsistent with all the other layouts.

Change-Id: I4473fe880ac471a3b5bc5399a454b10504589f87
 2012-11-30 21:55:33 -05:00
Jeff Sharkey
2278a997a5 am f41b7643: am 3f5c8ede: am 5e337eda: Merge "Push scrollbars to screen edges." into jb-mr1.1-dev 
* commit 'f41b76430d584733dcfa9a2386bf0c379d04b0ed':
  Push scrollbars to screen edges.
 2012-11-30 18:47:13 -08:00
Jeff Sharkey
c5f0fcde0d am 90b39714: am 3024299c: am c3f76cf1: Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev 
* commit '90b39714e9a9ec1064382be64e2dd46e85a3e2b6':
  Fix text alignment and simplify layouts.
 2012-11-30 18:47:12 -08:00
Jeff Sharkey
10b9928a11 am 1ed3d1c8: am 1d3dbecd: am b0f3f8db: Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev 
* commit '1ed3d1c820886732f293f0909a4dbfcb651deae4':
  Fix incorrectly inverted text color.
 2012-11-30 18:47:11 -08:00
Danielle Millett
783d0e7d9d am a5ca5158: am 49562681: Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev 
* commit 'a5ca51587d2fe3872f9e8610b5bd6e3e29bdefb1':
  Removing tutorial for choosing a pattern as part of b/7459863
 2012-11-30 18:31:26 -08:00
Danielle Millett
a5ca51587d am 49562681: Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev 
* commit '495626818d5fcba9c7e15c23788a55e456116260':
  Removing tutorial for choosing a pattern as part of b/7459863
 2012-11-30 18:29:14 -08:00
Danielle Millett
495626818d Merge "Removing tutorial for choosing a pattern as part of b/7459863" into jb-mr1.1-dev 2012-11-30 18:26:58 -08:00
Jeff Sharkey
f41b76430d am 3f5c8ede: am 5e337eda: Merge "Push scrollbars to screen edges." into jb-mr1.1-dev 
* commit '3f5c8ede376ecd0ea5610414a2f99191931ae77b':
  Push scrollbars to screen edges.
 2012-11-30 17:48:46 -08:00
Jeff Sharkey
3f5c8ede37 am 5e337eda: Merge "Push scrollbars to screen edges." into jb-mr1.1-dev 
* commit '5e337eda4ff40673e1498603134b6731b8e50da1':
  Push scrollbars to screen edges.
 2012-11-30 17:46:47 -08:00
Jeff Sharkey
90b39714e9 am 3024299c: am c3f76cf1: Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev 
* commit '3024299c6f046a0bb856c6e23d10ac851842d293':
  Fix text alignment and simplify layouts.
 2012-11-30 17:46:18 -08:00
Jeff Sharkey
1ed3d1c820 am 1d3dbecd: am b0f3f8db: Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev 
* commit '1d3dbecd9c76e0475f77d5bb443cd06018513944':
  Fix incorrectly inverted text color.
 2012-11-30 17:46:17 -08:00
Jeff Sharkey
3024299c6f am c3f76cf1: Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev 
* commit 'c3f76cf130a93fff5fefd7ccaa8de947bee99665':
  Fix text alignment and simplify layouts.
 2012-11-30 17:45:22 -08:00
Jeff Sharkey
1d3dbecd9c am b0f3f8db: Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev 
* commit 'b0f3f8dbea32c8566ae29af4b9e2fcb904588c4f':
  Fix incorrectly inverted text color.
 2012-11-30 17:45:20 -08:00
Jeff Sharkey
5e337eda4f Merge "Push scrollbars to screen edges." into jb-mr1.1-dev 2012-11-30 17:44:53 -08:00
Jeff Sharkey
c3f76cf130 Merge "Fix text alignment and simplify layouts." into jb-mr1.1-dev 2012-11-30 17:44:48 -08:00
Jeff Sharkey
b0f3f8dbea Merge "Fix incorrectly inverted text color." into jb-mr1.1-dev 2012-11-30 17:44:23 -08:00
Amith Yamasani
539ac24783 am 5ddbefbe: am 64e327e1: am 1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev 
* commit '5ddbefbe7b176be6c822d368d782cdc6d010b97c':
  Disable USB debugging checkbox and backup password for secondary users
 2012-11-30 16:48:20 -08:00
Amith Yamasani
5ddbefbe7b am 64e327e1: am 1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev 
* commit '64e327e1ef441491e700270e24299912aea8d6fe':
  Disable USB debugging checkbox and backup password for secondary users
 2012-11-30 16:46:06 -08:00
Amith Yamasani
64e327e1ef am 1cadd481: Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev 
* commit '1cadd481bc34b466809b944a0f8490767cf92787':
  Disable USB debugging checkbox and backup password for secondary users
 2012-11-30 16:44:27 -08:00
Amith Yamasani
1cadd481bc Merge "Disable USB debugging checkbox and backup password for secondary users" into jb-mr1.1-dev 2012-11-30 16:42:05 -08:00
Jeff Sharkey
97d07fa3ae Push scrollbars to screen edges. 
Push scrollbar to screen edges on custom ListView and ScrollViews to
match Preferences framework behavior.

Bug: 7633165
Change-Id: Ideecd0e243c7de7bf977caef2b1585e707a00ca4
 2012-11-30 16:15:09 -08:00
Jeff Sharkey
6f8cd76870 Fix text alignment and simplify layouts. 
Fix Apps items to correctly base align text, and to align correctly
in RTL mode.  Use GridLayout to reduce layout complexity.

Bug: 7633350, 7132595
Change-Id: Ic3563cfe408ebcdaef1ed693cc6b01b886d700ea
 2012-11-30 14:26:47 -08:00
Amith Yamasani
48d000ee2e Disable USB debugging checkbox and backup password for secondary users 
This prevents secondary users from turning on adb debugging, even if they
find a way to launch developer options. Similarly, don't let them add or
change the adb backup password.

Bug: 7637920
Change-Id: I297f0c515a276ede6a7f12d2add72faec4eeb384
 2012-11-30 14:20:04 -08:00
Jeff Sharkey
8f28cd5d75 Fix incorrectly inverted text color. 
Bug: 7632947
Change-Id: I2eb8c4c24bda5b08215204330c30431bf6d0fc27
 2012-11-30 12:32:58 -08:00
Daniel Sandler
b4fb63e411 am 8a8a265b: am aea3fbde: am 77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 
* commit '8a8a265b88bda03f0ccc221522e2f038aed9f1ff':
  Add android.settings.DREAM_SETTINGS for Daydream settings.
 2012-11-30 11:04:29 -08:00
Daniel Sandler
8a8a265b88 am aea3fbde: am 77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 
* commit 'aea3fbde280107738281f568cb1f4d860f50abfc':
  Add android.settings.DREAM_SETTINGS for Daydream settings.
 2012-11-30 11:02:23 -08:00
Daniel Sandler
aea3fbde28 am 77ec6de1: Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 
* commit '77ec6de156c52edbda95894a609cc43dcd29e454':
  Add android.settings.DREAM_SETTINGS for Daydream settings.
 2012-11-30 11:00:17 -08:00
Daniel Sandler
77ec6de156 Merge "Add android.settings.DREAM_SETTINGS for Daydream settings." into jb-mr1.1-dev 2012-11-30 10:58:04 -08:00
Evan Charlton
d781bcfc90 am a835f66e: am b71b78a4: am 6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 
* commit 'a835f66ec736b7c2cdf4ca433f70161ef2290359':
  Use plurals for the developer steps countdown
 2012-11-30 10:23:02 -08:00
Evan Charlton
a835f66ec7 am b71b78a4: am 6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 
* commit 'b71b78a4d4e8c4b7a7514abd692c72898cd665ce':
  Use plurals for the developer steps countdown
 2012-11-30 10:20:38 -08:00
Evan Charlton
b71b78a4d4 am 6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 
* commit '6c269982f3b188b5d7f70fcb670ab191b39b2689':
  Use plurals for the developer steps countdown
 2012-11-30 10:18:27 -08:00
Evan Charlton
6c269982f3 Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 2012-11-30 10:15:25 -08:00
Przemyslaw Szczepaniak
820dc4c910 Fix radio buttons when user cancel TTS engine change 
When user decides to change tts engine, and if it's not system one,
then he sees dialog warning about possibility of sending all kinds of
data to the engine.

If user chooses to not changes engine, radio button still sticks to the
new position.

This change delays all operations regarding changing current engine
after user closes dialog. It also unsets the radio button if user chooses
to cancel it.

Bug: 7628362
Change-Id: I977abe71b3547f2545a971fc0d69179be6fafb44
 2012-11-30 04:48:58 -08:00
Baligh Uddin
4745ccf1ae am df0c7e76: (-s ours) am 918c847d: am 43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'df0c7e76014c0765e764da6dbfc2a08309ac6018':
  Import translations. DO NOT MERGE
 2012-11-29 21:29:10 -08:00
Baligh Uddin
bf6711a033 am e5187da9: (-s ours) am 4d9ba011: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'e5187da9cc678c42fe6cc7eb644d1042be0c7eb4':
  Import translations. DO NOT MERGE
 2012-11-29 21:27:45 -08:00
Baligh Uddin
df0c7e7601 am 918c847d: am 43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '918c847dacbc52af3c1f438318bc1bb3ce9ceed8':
  Import translations. DO NOT MERGE
 2012-11-29 21:27:44 -08:00
Baligh Uddin
918c847dac am 43635081: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '436350817f550819a3bf514c9ea74e12a1fbb2e8':
  Import translations. DO NOT MERGE
 2012-11-29 21:25:46 -08:00
Baligh Uddin
e5187da9cc am 4d9ba011: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '4d9ba0114a4c5e3b54be65bee667ce3c3f06415e':
  Import translations. DO NOT MERGE
 2012-11-29 21:25:14 -08:00