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

9633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
8a84fa6ec9 Merge "Import translations. DO NOT MERGE" 2012-12-07 11:47:42 -08:00
Baligh Uddin
8d8f6b0860 am 4377b807: (-s ours) am 29ce5561: Import translations. DO NOT MERGE 
* commit '4377b80732d89ba10211ceff206517cf3c9ca875':
  Import translations. DO NOT MERGE
 2012-12-07 11:46:45 -08:00
Baligh Uddin
4377b80732 am 29ce5561: Import translations. DO NOT MERGE 
* commit '29ce5561d85c121c293acc13b60a291365679a46':
  Import translations. DO NOT MERGE
 2012-12-07 11:44:30 -08:00
Baligh Uddin
b0d0cf8e49 Import translations. DO NOT MERGE 
Change-Id: I7b1104d9f823970bc78cbd8681c67b300057f61b
Auto-generated-cl: translation import
 2012-12-07 11:38:03 -08:00
Baligh Uddin
29ce5561d8 Import translations. DO NOT MERGE 
Change-Id: Ic8bff7a52926a927353fa5933a68dfc17921e6d1
Auto-generated-cl: translation import
 2012-12-07 11:34:10 -08:00
Amith Yamasani
acf7a1873e am b722b80d: am b7d94e74: am aeb57eda: Pass the locale code in the help url for help pages. 
* commit 'b722b80da8481a1570dbe4be89b8ed70daec6b41':
  Pass the locale code in the help url for help pages.
 2012-12-07 10:47:45 -08:00
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
96e08d1961 am 1aa371fc: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '1aa371fcaf8ddec7fbd4368bd13420eaf3e5b1b6':
 2012-12-05 13:01:02 -08:00
Jake Hamby
a87df26fc2 am ac9bb0bd: am b39ab37a: am bc5d9271: Add latest area info broadcast to Settings status screen. 
* commit 'ac9bb0bdc0c2ef42d259e555187061a0ea95c8f2':
  Add latest area info broadcast to Settings status screen.
 2012-12-05 12:29:03 -08:00
Baligh Uddin
6d797213de am e912b763: (-s ours) am e30adf2f: am d2bd59f5: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit 'e912b763ee9e631129512162c3e934aaf4bc1e91':
  Import translations. DO NOT MERGE
 2012-12-05 12:23:11 -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
Baligh Uddin
67580f655a am 482dd21c: (-s ours) am 9a2cee1d: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '482dd21ca2ccd350957dba3cf7d207a8533a9bdf':
  Import translations. DO NOT MERGE
 2012-12-05 08:25:27 -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
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