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

9386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
df54b39694 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-08 07:53:46 -07:00
The Android Automerger
15bebe0da0 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 16:05:35 -07:00
Amith Yamasani
95867c3892 am 0f136cfd: am 40cbecb8: am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev 
* commit '0f136cfd4fcb570a94157f4f2044c0e6e7bff74e':
  Fix layout for decryption password entry.
 2012-10-07 14:08:26 -07:00
Amith Yamasani
0f136cfd4f am 40cbecb8: am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev 
* commit '40cbecb8c3081c778c2a83d80b71981f2f4bb169':
  Fix layout for decryption password entry.
 2012-10-07 14:06:03 -07:00
Amith Yamasani
40cbecb8c3 am 29707a50: Merge "Fix layout for decryption password entry." into jb-mr1-dev 
* commit '29707a501c6f61108e479a6129e89791dc5a1f36':
  Fix layout for decryption password entry.
 2012-10-07 14:04:10 -07:00
Amith Yamasani
29707a501c Merge "Fix layout for decryption password entry." into jb-mr1-dev 2012-10-07 14:02:26 -07:00
Svetoslav Ganov
b402660ccd am 5c9283fb: am 450a7ad6: am 7e54c544: Clean up \'accessibility shortcut\' screen. 
* commit '5c9283fbf824c6ca50ed6f28cccdd9c1ab0c1db2':
  Clean up 'accessibility shortcut' screen.
 2012-10-07 12:07:29 -07:00
Svetoslav Ganov
5c9283fbf8 am 450a7ad6: am 7e54c544: Clean up \'accessibility shortcut\' screen. 
* commit '450a7ad6a35c25d1307c90e364590b32ea44d2fa':
  Clean up 'accessibility shortcut' screen.
 2012-10-07 12:05:13 -07:00
Svetoslav Ganov
450a7ad6a3 am 7e54c544: Clean up \'accessibility shortcut\' screen. 
* commit '7e54c544aa3b16245486cf3787e79cab5bbdb651':
  Clean up 'accessibility shortcut' screen.
 2012-10-07 12:03:45 -07:00
Svetoslav Ganov
7e54c544aa Clean up 'accessibility shortcut' screen. 
1. Last polishes to the accessibility shortcut screen.

bug:7298927

Change-Id: I8109f215c63eeaa6ea4bf589aa4af897d09c5e03
 2012-10-07 11:48:57 -07:00
The Android Automerger
65eedd181c merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-07 06:59:55 -07:00
Amith Yamasani
d2e414c2b6 Fix layout for decryption password entry. 
Use the same layout for landscape and portrait, which vertically centers
the password entry field. Works fine for portrait.

Also removed some vestigial keyboard view in the layout.

Bug: 7298970
Change-Id: I499468dda5e6eb46815fd0bed786d14c892cc830
 2012-10-07 06:34:47 -07:00
Amith Yamasani
f731e47a36 am 60b4d615: am a1e19608: am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev 
* commit '60b4d615c619aaf268fd3d1fd101f7524756b3fb':
  Revert "Show warning dialog in a multiuser system when adding a new account."
 2012-10-05 20:58:23 -07:00
Amith Yamasani
60b4d615c6 am a1e19608: am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev 
* commit 'a1e1960890f05e2e4afd9ad3bf2f68636100152e':
  Revert "Show warning dialog in a multiuser system when adding a new account."
 2012-10-05 20:56:13 -07:00
Amith Yamasani
a1e1960890 am 0b146b23: Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev 
* commit '0b146b238496fdb36ad575f9a0b96dc43f812aa3':
  Revert "Show warning dialog in a multiuser system when adding a new account."
 2012-10-05 20:54:35 -07:00
Amith Yamasani
0b146b2384 Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev 2012-10-05 20:53:03 -07:00
Amith Yamasani
21c2904ba3 Revert "Show warning dialog in a multiuser system when adding a new account." 
This reverts commit eb71f26897

Change-Id: Iad4a6656e922c0d2dbd3dd349d1c24d597eab7f5
 2012-10-05 19:56:18 -07:00
Baligh Uddin
28be694aa0 Import translations. DO NOT MERGE 
Change-Id: Idde76e1ee183e5d2acadc98d6e100b4d85032313
Auto-generated-cl: translation import
 2012-10-05 16:31:58 -07:00
Baligh Uddin
b1597fca1f Import translations. DO NOT MERGE 
Change-Id: I370e6491b374c4c828b128955eefce762335fa52
Auto-generated-cl: translation import
 2012-10-05 16:29:40 -07:00
Baligh Uddin
9be89088da Import translations. DO NOT MERGE 
Change-Id: I6c6a598c03f12d3ac9e9a3cc08d479d7b8f1f274
Auto-generated-cl: translation import
 2012-10-05 16:27:44 -07:00
Adam Cohen
3757a635a6 am e7be6192: am 517f5ced: am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev 
* commit 'e7be6192ed7337d81a77ad1da11dba2c578929c7':
  Fixing filter for status widget (issue 7295596)
 2012-10-05 14:21:18 -07:00
Svetoslav Ganov
4b4297f7fc am 2c72ba6d: am 3b1520ee: am 78995994: Updating the screen magnification strings. 
* commit '2c72ba6de2e2dbce1278ef67db0e65439c9c1577':
  Updating the screen magnification strings.
 2012-10-05 14:21:17 -07:00
Adam Cohen
e7be6192ed am 517f5ced: am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev 
* commit '517f5cede9c61c981e0759798664914201b5d0e2':
  Fixing filter for status widget (issue 7295596)
 2012-10-05 14:20:14 -07:00
Svetoslav Ganov
2c72ba6de2 am 3b1520ee: am 78995994: Updating the screen magnification strings. 
* commit '3b1520eed7566e03244e6fc1aa307c2155bd6e69':
  Updating the screen magnification strings.
 2012-10-05 14:18:51 -07:00
Adam Cohen
517f5cede9 am 1f9a07b5: Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev 
* commit '1f9a07b5e9b1868fc6741c99e74970aa0e9762fe':
  Fixing filter for status widget (issue 7295596)
 2012-10-05 14:18:24 -07:00
Svetoslav Ganov
3b1520eed7 am 78995994: Updating the screen magnification strings. 
* commit '78995994b9b0afbc4c4705e41d1c4ac944e557f2':
  Updating the screen magnification strings.
 2012-10-05 14:16:58 -07:00
Adam Cohen
1f9a07b5e9 Merge "Fixing filter for status widget (issue 7295596)" into jb-mr1-dev 2012-10-05 14:16:42 -07:00
Svetoslav Ganov
78995994b9 Updating the screen magnification strings. 
bug:7295457

Change-Id: Idef3950b975fbb8071067c165fa52358aa6b828d
 2012-10-05 14:13:42 -07:00
Jeff Sharkey
897c3c8937 am f49a4702: am dd51496c: am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev 
* commit 'f49a470253c8310b024b6121b782e70b2f5f935a':
  Avoid NPE when missing PackageInfo.
 2012-10-05 13:59:08 -07:00
Jeff Sharkey
f49a470253 am dd51496c: am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev 
* commit 'dd51496cf3c1b1e5e24652a669c3889e1c31720d':
  Avoid NPE when missing PackageInfo.
 2012-10-05 13:57:22 -07:00
Jeff Sharkey
dd51496cf3 am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev 
* commit '4a58b1006cec93565a7106c117b2c87248341404':
  Avoid NPE when missing PackageInfo.
 2012-10-05 13:55:36 -07:00
Jeff Sharkey
4a58b1006c Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev 2012-10-05 13:53:39 -07:00
Svetoslav Ganov
381a95b209 am eb8c57d9: am 3c95a3b9: am 69621ece: Locale selection settings do not hide warning dialog. 
* commit 'eb8c57d909d1498639d32e82bdda52393ed761ee':
  Locale selection settings do not hide warning dialog.
 2012-10-05 13:52:37 -07:00
Svetoslav Ganov
eb8c57d909 am 3c95a3b9: am 69621ece: Locale selection settings do not hide warning dialog. 
* commit '3c95a3b947cc251bb5379b026e465d9541df6345':
  Locale selection settings do not hide warning dialog.
 2012-10-05 13:49:53 -07:00
Svetoslav Ganov
3c95a3b947 am 69621ece: Locale selection settings do not hide warning dialog. 
* commit '69621ece97d9f82e7408562f28110f40d872cb24':
  Locale selection settings do not hide warning dialog.
 2012-10-05 13:48:08 -07:00
Adam Cohen
a1c314a879 Fixing filter for status widget (issue 7295596) 
Change-Id: I63515bc68550357b8e2738450eefa01ec3122229
 2012-10-05 13:42:04 -07:00
Jeff Sharkey
54b3f501ca Avoid NPE when missing PackageInfo. 
Bug: 7296861
Change-Id: I87b64d5f4b1f34e47d785a18a029130fdca874a1
 2012-10-05 13:34:41 -07:00
Svetoslav Ganov
69621ece97 Locale selection settings do not hide warning dialog. 
1. If there is more than one user on the device and a user tries
   to modify the locale which is shared across all users we are
   showing a warning dialog. When the user selects OK we are
   changing the locale and going to the previous screen. This is
   achieved by removing the locale selection fragment from the
   backstack. The problem was that the dialog was not dismissed
   upon OK in the dialog which resulted in saving the dialog's
   state and an attempt to restore it on the wrong fragment which
   has no idea about this dialog, this returning a null dialog
   resulting in a crash. This change removes the dialog on
   OK selection.

bug:7265186

Change-Id: I336ab54f5281c7a9ae24f1c25769daac46477ebd
 2012-10-05 12:49:25 -07:00
The Android Open Source Project
31f2cb77c4 am 3ddc5049: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '3ddc5049fccffa0fee9670d2833318ff35121c8d':
 2012-10-05 08:20:53 -07:00
The Android Open Source Project
3ddc5049fc Reconcile with jb-mr1-release - do not merge 
Change-Id: Id2efe6503779bfb18d403b49dfaac9ad9f392bc3
 2012-10-05 08:18:21 -07:00
The Android Automerger
6a2bf2a8cd merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-05 07:00:19 -07:00
Baligh Uddin
9fff3f5790 am 62a725f9: (-s ours) am babf1a43: am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '62a725f9c3f01e846b5f27d851349d92f6af2d5f':
  Import translations. DO NOT MERGE
 2012-10-04 22:26:07 -07:00
Baligh Uddin
62a725f9c3 am babf1a43: am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'babf1a4348cb94a1dfadf4c454452d67f27dfdc6':
  Import translations. DO NOT MERGE
 2012-10-04 22:23:48 -07:00
Baligh Uddin
127254ab5f am e8d64472: (-s ours) am 3d72d169: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'e8d64472319dbc6e67ce964e8712dc0a676298ae':
  Import translations. DO NOT MERGE
 2012-10-04 22:22:59 -07:00
Baligh Uddin
babf1a4348 am 9d904890: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '9d90489078b406d3a52e27ef517278e15f603f76':
  Import translations. DO NOT MERGE
 2012-10-04 22:21:01 -07:00
Baligh Uddin
e8d6447231 am 3d72d169: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '3d72d169568665b7aa08342c9392fe7f2326cfa8':
  Import translations. DO NOT MERGE
 2012-10-04 22:20:53 -07:00
Baligh Uddin
fc2f177971 Merge "Import translations. DO NOT MERGE" 2012-10-04 22:19:35 -07:00
Baligh Uddin
9d90489078 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-04 22:19:15 -07:00
Baligh Uddin
3d72d16956 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-04 22:18:41 -07:00
Amith Yamasani
af721bbb49 am 16fd6059: am 42171a2c: am 6fd359d8: Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev 
* commit '16fd6059eeed4f9d1b7e4fac3b5a0fe9686d2229':
  Move the position of widget choosers to below lockscreen settings in Security
 2012-10-04 22:02:36 -07:00