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

9232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
b722b80da8 am b7d94e74: am aeb57eda: Pass the locale code in the help url for help pages. 
* commit 'b7d94e74e1342c5583883e596fd268745a5a25b6':
  Pass the locale code in the help url for help pages.
 2012-12-07 10:45:30 -08:00
Amith Yamasani
b7d94e74e1 am aeb57eda: Pass the locale code in the help url for help pages. 
* commit 'aeb57edaef1abdcdcd21eb443047386940ffb755':
  Pass the locale code in the help url for help pages.
 2012-12-07 10:43:37 -08:00
Amith Yamasani
aeb57edaef Pass the locale code in the help url for help pages. 
Otherwise the help will always be shown in English.

Bug: 7564049
Change-Id: I94da36aa1ae5aabd118178866b7e570bb77add34
 2012-12-06 14:40:51 -08:00
The Android Open Source Project
1aa371fcaf Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I2333de9f3a171fef3c806003d0e662570d01af1e
 2012-12-05 11:10:16 -08:00
The Android Automerger
5ca8e96df4 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-05 10:27:58 -08:00
Jake Hamby
ac9bb0bdc0 am b39ab37a: am bc5d9271: Add latest area info broadcast to Settings status screen. 
* commit 'b39ab37aa0e8be02a61c4245c181e523419ba703':
  Add latest area info broadcast to Settings status screen.
 2012-12-04 20:09:34 -08:00
Jake Hamby
b39ab37aa0 am bc5d9271: Add latest area info broadcast to Settings status screen. 
* commit 'bc5d9271a9d36ecf07ac35e1635f36679074de6f':
  Add latest area info broadcast to Settings status screen.
 2012-12-04 20:08:21 -08:00
The Android Automerger
11efd544bf merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-04 19:59:27 -08:00
Jake Hamby
bc5d9271a9 Add latest area info broadcast to Settings status screen. 
When the SIM has a Brazilian country code, add an item to the
status screen to show the most recently received area info cell
broadcast, requested from CellBroadcastReceiver, which also
broadcasts any updates to the area info. To read the area info
broadcast or request it from CellBroadcastReceiver requires
READ_PHONE_STATE permission.

Bug: 7445881
Change-Id: I387e23ecd0802b212ecb3e44f900a3a7a4b27e76
 2012-12-04 18:18:55 -08:00
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
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
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
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
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
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
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
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
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