PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,066 Commits 1 Branch 0 Tags
377002fa1a7a69de48d2f655a75b20f290c9fb6c
Commit Graph

10066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
e912b763ee am e30adf2f: am d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'e30adf2f65241b6337dc4090631673a2fec904e1':
  Import translations. DO NOT MERGE
 2012-12-04 16:34:48 -08:00
Baligh Uddin
e30adf2f65 am d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'd2bd59f5e8e2359e6697dd8975ccfd1aa36b4103':
  Import translations. DO NOT MERGE
 2012-12-04 16:31:30 -08:00
Baligh Uddin
482dd21ca2 am 9a2cee1d: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '9a2cee1d1e391147b3e21d10549b190ba79c4199':
  Import translations. DO NOT MERGE
 2012-12-04 13:49:33 -08:00
Baligh Uddin
9a2cee1d1e Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-12-04 13:47:16 -08:00
Baligh Uddin
d2bd59f5e8 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-04 13:46:56 -08:00
Baligh Uddin
cdc73b5be8 Import translations. DO NOT MERGE 
Change-Id: I2ef0dc90375c2d1b8d341b2e747352d4a3313925
Auto-generated-cl: translation import
 2012-12-04 11:16:12 -08:00
Baligh Uddin
e9bda5095c Import translations. DO NOT MERGE 
Change-Id: I950a025ffdb3ac8cb21a9e80175eef115ddac9d4
Auto-generated-cl: translation import
 2012-12-04 11:14:54 -08:00
Daniel Sandler
a6621fe7bf am 1c7c8242: am 5428ce65: am 300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 
* commit '1c7c8242ae946c102aca7737cd85ab743aabcb74':
  Revised language for notification ringtone picker.
 2012-12-04 11:06:53 -08:00
Daniel Sandler
1c7c8242ae am 5428ce65: am 300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 
* commit '5428ce650b161f5a4dfdccb2b4a54f18544e4068':
  Revised language for notification ringtone picker.
 2012-12-04 11:04:57 -08:00
Daniel Sandler
5428ce650b am 300f8299: Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 
* commit '300f8299a6085e295e288d535ad3b8fd0ccbb1cf':
  Revised language for notification ringtone picker.
 2012-12-04 11:02:18 -08:00
Daniel Sandler
300f8299a6 Merge "Revised language for notification ringtone picker." into jb-mr1.1-dev 2012-12-04 11:01:00 -08:00
Baligh Uddin
50777ba3ad am 1e9dea67: (-s ours) am 613b168d: am d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '1e9dea67c93b8791a60e201ecdb5b7372c82cec6':
  Import translations. DO NOT MERGE
 2012-12-04 08:21:43 -08:00
Baligh Uddin
ca84b24e9d am 1991ec83: (-s ours) am a62ac990: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '1991ec8386b7c85d20db290d9e414f1787198737':
  Import translations. DO NOT MERGE
 2012-12-04 08:20:17 -08:00
Baligh Uddin
1e9dea67c9 am 613b168d: am d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '613b168df1eb569db9ed9d1345847fea1674b9b0':
  Import translations. DO NOT MERGE
 2012-12-04 08:19:09 -08:00
Baligh Uddin
1991ec8386 am a62ac990: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'a62ac990a13fdb3f8e8e35dae30c2453cbe51cbc':
  Import translations. DO NOT MERGE
 2012-12-04 08:17:44 -08:00
Baligh Uddin
613b168df1 am d2380b8e: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'd2380b8e2f783c96fcf55b69a9bb5e90a91b0af8':
  Import translations. DO NOT MERGE
 2012-12-04 08:16:59 -08:00
Baligh Uddin
a62ac990a1 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-12-04 08:15:37 -08:00
Baligh Uddin
d2380b8e2f Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-04 08:15:04 -08:00
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