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

8529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
9cff5e3f4a am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'f4b1aefbaafba7ba290a05bce84f77ee5ad5b043':
 2013-03-11 12:42:01 -07:00
Jean-Baptiste Queru
f4b1aefbaa am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '8638eeb4e925009fcc91fd9a9965740c25fe518a':
 2013-03-11 12:27:42 -07:00
Jean-Baptiste Queru
8638eeb4e9 Reconcile with jb-mr1-release - do not merge 2013-03-11 12:22:07 -07:00
Jean Chalard
a374d81605 Distinguish adding an already present word / cancelling 
Bug: 7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50
 2012-12-17 15:52:07 +09:00
Mike Cleron
1f597c8764 Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev 2012-12-14 10:57:18 -08:00
Jean Chalard
e3f1171309 Call back to whom requested to add a word to the user dict 
Bug: 7725834
Change-Id: I2537754789f25fa978efd457979ed130806b9fbf
 2012-12-14 18:08:05 +09:00
Irfan Sheriff
2a9cbb61b3 am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev 
* commit 'f197105e3bd83a1f244cb690a1aa615624629961':
  Fix wifi compareTo
 2012-12-13 11:30:41 -08:00
Irfan Sheriff
f197105e3b Merge "Fix wifi compareTo" into jb-mr1-dev 2012-12-13 11:28:48 -08:00
Irfan Sheriff
ebc57e3ae6 Fix wifi compareTo 
Bug: 7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40
 2012-12-13 11:00:24 -08:00
Baligh Uddin
5b4509b5ad Import translations. DO NOT MERGE 
Change-Id: Iea0171a572174bec2168592681ee0f44d1a74083
Auto-generated-cl: translation import
 2012-12-12 13:19:14 -08:00
Baligh Uddin
67e9e59bc9 Import translations. DO NOT MERGE 
Change-Id: I5d16be7510affd0f6e453fe42ecf833c680313e5
Auto-generated-cl: translation import
 2012-12-10 10:57:09 -08:00
Baligh Uddin
3674d86951 Import translations. DO NOT MERGE 
Change-Id: I0958247f9b14b944fb0bdc04517e65aabba166c1
Auto-generated-cl: translation import
 2012-12-07 11:35:18 -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
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
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
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
d2380b8e2f Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-12-04 08:15:04 -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
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
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
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
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
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
6c269982f3 Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev 2012-11-30 10:15:25 -08:00
Baligh Uddin
436350817f Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-29 21:23:45 -08:00
Jeff Sharkey
39b7bd8cbc Merge "Use uniform font size for APNs and timezones. DO NOT MERGE." into jb-mr1.1-dev 2012-11-29 17:58:24 -08:00
Jeff Sharkey
5d376860e9 Merge "Avoid split action bar when it only has one item. DO NOT MERGE." into jb-mr1.1-dev 2012-11-29 17:58:19 -08:00
Jake Hamby
6e8644bcca Add string resource removed by previous commit. 
The "bluetooth_permission_request" string resource was removed in
a previous commit, but is still referenced by a manifest element.
Add the original string resource to strings.xml.

Bug: 7641406
Change-Id: I9a41760c74d8a243ff5e8d2d7938f81207e75173
 2012-11-29 15:06:20 -08:00
Jeff Sharkey
4166ec39ec Use uniform font size for APNs and timezones. DO NOT MERGE. 
Also get rid of some orange highlight!

Bug: 7632945
Change-Id: I6a4b59f4eef81b128d128f5a429fb96f6366843a
 2012-11-29 14:50:11 -08:00
Jeff Sharkey
c2b43dbee8 Avoid split action bar when it only has one item. DO NOT MERGE. 
Bug: 7632944
Change-Id: I055564b4f8d2a3fc97346e13e1d8818196a8f988
 2012-11-29 14:50:02 -08:00
Jake Hamby
0206284a66 Merge "Fix Bluetooth enable dialog to match Android style guide." into jb-mr1.1-dev 2012-11-29 14:14:10 -08:00
Baligh Uddin
8092adf3a9 Import translations. DO NOT MERGE 
Change-Id: I89608bcb397958bf76472adb67ec1402f4a3ed5c
Auto-generated-cl: translation import
 2012-11-29 11:05:49 -08:00
Dianne Hackborn
af60480107 Merge "Be quiet!" into jb-mr1.1-dev 2012-11-28 18:18:00 -08:00
Dianne Hackborn
79d42bb622 Be quiet! 
Change-Id: Ifcce5bf4b2fca35fe50a2684983dc726534c3d0c
 2012-11-28 18:05:00 -08:00
Adam Cohen
9067d57a88 Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-28 17:47:19 -08:00
Adam Cohen
441588d221 Making sure keyguard and homescreen only display eligible widgets (issue 7550090) 
Change-Id: Ia1eb902618855e1a86a84c9090cdeefe5a404fd7
 2012-11-28 16:37:49 -08:00
John Spurlock
fc4be3856f Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev 2012-11-28 06:30:29 -08:00
Daniel Sandler
7dee75c424 Add android.settings.DREAM_SETTINGS for Daydream settings. 
Bug: 7480927
Change-Id: I5777f7c4aec9ad7d7eb9f7eeb882d2342cb481c3
 2012-11-27 22:41:30 -05:00
Baligh Uddin
3236571f45 am 42db418f: Import translations. DO NOT MERGE 
* commit '42db418f963dfd200a75b518971c719215af352a':
  Import translations. DO NOT MERGE
 2012-11-27 14:23:27 -08:00
Baligh Uddin
1e9f8d6f54 Import translations. DO NOT MERGE 
Change-Id: Ibe10143bc63383ced22f10c1b7d35f90424dcb2f
Auto-generated-cl: translation import
 2012-11-27 14:22:35 -08:00
Baligh Uddin
42db418f96 Import translations. DO NOT MERGE 
Change-Id: I5b887c229653be7d975d36f96b2cdc66ebb498a9
Auto-generated-cl: translation import
 2012-11-27 14:21:30 -08:00
John Spurlock
8a9edfb1e3 Update a few dream setting strings to ease translation. 
Clarify that sleep = asleep and charging as we do in the ui.

Bug: 7564443
Change-Id: Id50938d6d4052fd4223e212125d10f4bfd0c6908
 2012-11-27 10:20:08 -05:00