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

8906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
a9a28d2fee am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'f96a86c99d7505e15a39266967cf4d4d75295af1':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:32:46 -07:00
Dianne Hackborn
f96a86c99d am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '6d80d477391c6ad14a6bcdb044c3351de4e20481':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:30:51 -07:00
Dianne Hackborn
6d80d47739 am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:29:04 -07:00
Dianne Hackborn
0bccd7e7f4 am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit '5f28c77bc64deb132082eaab0ebd544ba5111bd0':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:26:39 -07:00
Dianne Hackborn
5f28c77bc6 am d6086125: Fix issue #9074296: Device Admins can activate in a way... 
* commit 'd60861258169083f3174734af821fc8078ec5d2f':
  Fix issue #9074296: Device Admins can activate in a way...
 2013-06-06 12:23:05 -07:00
Dianne Hackborn
d608612581 Fix issue #9074296: Device Admins can activate in a way... 
...that makes it impossible to deactive/uninstall them

Don't allow device admins to directly launch the add UI if
they are malformed.

(cherry picked from commit 8274b67702)

Changes due to make the cherry-pick apply:
* Replaced PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS with 0
  in the PackageManager.queryBroadcastReceivers invocation. The above
  constant was introduced in API Level 18 only. DeviceAdminSettings
  class from which this fix was extracted is not passing in the above
  flag when it invokes queryBroadcastReceivers either.

Change-Id: I64d2792cd06bacbd4bfc600a10046d51a9383606
 2013-06-05 15:48:20 -07:00
Jean-Baptiste Queru
33adccd203 am 9cff5e3f: am f4b1aefb: (-s ours) am 8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c':
 2013-03-11 13:00:49 -07:00
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
d0a9d5b6e0 am a374d816: Distinguish adding an already present word / cancelling 
* commit 'a374d81605f4ba760db9613dd8aa8d8a0370dab8':
  Distinguish adding an already present word / cancelling
 2012-12-17 10:44:36 -08: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
49ce96a14b am 1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev 
* commit '1f597c8764b375bf87d411d11a29b2808e1d2ef9':
  Call back to whom requested to add a word to the user dict
 2012-12-14 10:59:17 -08: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
878072a11a am 2a9cbb61: am f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev 
* commit '2a9cbb61b3d8bae75b3a6e769dbe1c69c563f210':
  Fix wifi compareTo
 2012-12-13 11:32:51 -08: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
efacd47f4f am 5b4509b5: Import translations. DO NOT MERGE 
* commit '5b4509b5adf2f3e12ffb7df4065fcdfd7e5e3f93':
  Import translations. DO NOT MERGE
 2012-12-12 13:40:49 -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
92ff5ebe1e Import translations. DO NOT MERGE 
Change-Id: I4067263fdbd86c2b1037443ad7360fb17cabe56c
Auto-generated-cl: translation import
 2012-12-12 13:17:55 -08:00
Baligh Uddin
777688c963 am 67e9e59b: Import translations. DO NOT MERGE 
* commit '67e9e59bc943481b091998ba114ca6750f46b383':
  Import translations. DO NOT MERGE
 2012-12-10 21:12:41 -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
3b10f0ba05 Import translations. DO NOT MERGE 
Change-Id: I1f403d01d8d3d7336d869555e69af22b460f7a37
Auto-generated-cl: translation import
 2012-12-10 10:55:55 -08:00
Baligh Uddin
957f7fc94e am 3674d869: Import translations. DO NOT MERGE 
* commit '3674d8695166be6c0b7cc225f227f9e1604056e8':
  Import translations. DO NOT MERGE
 2012-12-07 11:44:18 -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
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
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
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
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
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
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
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
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
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
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
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
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