Dianne Hackborn
2500f7a3f5
am ad38b60b: am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.
...
* commit 'ad38b60b372314f6266381207bd82144f21b1027':
Reset app preferences now resets all app ops.
2013-08-03 00:10:16 -07:00
Dianne Hackborn
ad38b60b37
am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.
...
* commit '0a09b13c81bb0ebe556e46e3859a25805b2cbdcf':
Reset app preferences now resets all app ops.
2013-08-02 19:32:14 -07:00
Dianne Hackborn
0a09b13c81
am a6683e0f: Reset app preferences now resets all app ops.
...
* commit 'a6683e0f4af75005ab5a1742d30df4bee071f725':
Reset app preferences now resets all app ops.
2013-08-02 19:30:09 -07:00
Dianne Hackborn
a6683e0f4a
Reset app preferences now resets all app ops.
...
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
2013-08-02 19:20:48 -07:00
Jeff Brown
84dea9e038
Add secure overlay displays in developer options.
...
Change-Id: I16fb0429de42443a95e8dfd03382bf8e0c2a6bb7
2013-08-02 19:07:05 -07:00
Jean-Baptiste Queru
14c8056525
am a43e2701: (-s ours) am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
...
* commit 'a43e27016410910e9d11c09e981e58743ee9439e':
Completely remove app ops activity.
2013-08-02 17:58:47 -07:00
Jean-Baptiste Queru
a43e270164
am 4dce3456: am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
...
* commit '4dce3456c7c858d5cec053cfd8a7f8ff2babec1d':
Completely remove app ops activity.
2013-08-02 17:44:48 -07:00
Jean-Baptiste Queru
4dce3456c7
am 034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
...
* commit '034b83e8668a0b26d1eccfc9fa433b8eae3e50a8':
Completely remove app ops activity.
2013-08-02 17:39:03 -07:00
Lifu Tang
1cad5b21e4
Merge "Added UI widgets for new location settings page"
2013-08-03 00:04:24 +00:00
Lifu Tang
d5fbbc4e49
Added UI widgets for new location settings page
...
Change-Id: I87eee999a4dd0189609f58d6f3e4ffe517d63a0e
2013-08-02 16:57:07 -07:00
Dianne Hackborn
b1f8607379
am 45d4dce2: (-s ours) am ca1b7458: Completely remove app ops activity.
...
* commit '45d4dce29eea9fd503b15aedf4f63e38bf5fb0d7':
Completely remove app ops activity.
2013-08-02 15:03:21 -07:00
Baligh Uddin
dbf91c105a
Merge commit '0b849a70'
...
Resolve conflict.
Conflicts:
AndroidManifest.xml
2013-08-02 14:51:33 -07:00
Jean-Baptiste Queru
034b83e866
Reconcile with AOSP jb-mr2-dev - do not merge
2013-08-02 14:48:27 -07:00
Dianne Hackborn
67c0500290
Completely remove app ops activity.
...
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
2013-08-02 14:45:05 -07:00
Dianne Hackborn
45d4dce29e
am ca1b7458: Completely remove app ops activity.
...
* commit 'ca1b7458244191214172009d21eae2d04b6992f9':
Completely remove app ops activity.
2013-08-02 14:41:18 -07:00
Dianne Hackborn
ca1b745824
Completely remove app ops activity.
...
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
2013-08-02 14:35:10 -07:00
Geoffrey Borggaard
8f09a57604
Merge "Adds a base class for restricted settings"
2013-08-02 21:09:41 +00:00
Geoffrey Borggaard
e38ea38002
Adds a base class for restricted settings
...
Creates an easy way to ask for the restriction pin before
allowing access to a settings page. Does this to the WiFiSettings.
Change-Id: I49734f66e09b6449596412ecf6fc1113bf57ce7f
2013-08-02 17:07:21 -04:00
Dave Burke
0b849a704b
am 1a32d477: am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
...
* commit '1a32d477934399ca5331863fe17651c1dbf165b8':
Revert "Completely remove app ops activity."
2013-08-02 13:42:04 -07:00
Dave Burke
1a32d47793
am 136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
...
* commit '136059f118b580a3dc8f3023d1d19c8c56020a01':
Revert "Completely remove app ops activity."
2013-08-02 13:39:13 -07:00
Dave Burke
136059f118
Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
2013-08-02 20:36:33 +00:00
Dave Burke
db2c568894
Revert "Completely remove app ops activity."
...
This reverts commit 1ad26e9c37
2013-08-02 20:25:35 +00:00
Baligh Uddin
06a9300f97
Merge "Import translations. DO NOT MERGE"
2013-08-02 16:58:47 +00:00
Satoshi Kataoka
d3e8bed913
Fix ime settings
...
Bug: 8364845
Change-Id: I1c9b30fa64682b905ef32c10bda0c9f93e8be975
2013-08-02 20:52:12 +09:00
Satoshi Kataoka
c6fc8e46f2
Allow the users to disable system IME
...
Bug: 8364845
Change-Id: Icc5173a68fa00b2895c0768ff8f8b9dcf30e6171
2013-08-02 20:06:34 +09:00
Baligh Uddin
15885f4998
Merge commit '99d5938c'
...
Resolve conflict per ag/326799
Conflicts:
AndroidManifest.xml
2013-08-01 15:04:30 -07:00
Sascha Prueter
99d5938cf2
am df195650: am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
...
* commit 'df195650191ba2d5a6090ff0721242b044b9b010':
Completely remove app ops activity.
2013-08-01 14:01:13 -07:00
Baligh Uddin
21914a7c9c
Import translations. DO NOT MERGE
...
Change-Id: I619da6bcb74ebdb1bbb94878f62966870bf6ca64
Auto-generated-cl: translation import
2013-08-01 13:59:46 -07:00
Sascha Prueter
df19565019
am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
...
* commit 'd346fce2687237d30677b69e66c76ba6cba8622b':
Completely remove app ops activity.
2013-08-01 13:58:23 -07:00
Sascha Prueter
d346fce268
Merge "Completely remove app ops activity." into jb-mr2-dev
2013-08-01 20:55:38 +00:00
David Christie
34605e1dcf
Merge "Add Strings for the new high power location monitoring app op."
2013-08-01 19:26:08 +00:00
Amith Yamasani
e990420f52
Add import for recently moved class
...
Change-Id: Iee617cf00271344bd6494824ca980c96e6df72bf
2013-08-01 10:26:14 -07:00
Amith Yamasani
a7fd2a5d66
Merge "Whitelist fragments appropriate for an activity"
2013-08-01 17:18:39 +00:00
Lifu Tang
fc86f69d3b
Implemented RadioButtonPreference
...
Change-Id: I047b6a95f3001b60e7500f85c25d507e1ca1ad0f
2013-07-31 11:07:27 -07:00
Amith Yamasani
a677ee210c
Whitelist fragments appropriate for an activity
...
Change-Id: If4f8c4e9d9949b652946cffe0ebb09b587e5a042
2013-07-30 16:24:58 -07:00
Lifu Tang
040ce60582
Merge "Moved LocationSettings into location sub-package"
2013-07-30 18:43:16 +00:00
David Christie
4a06e4cc43
Add Strings for the new high power location monitoring app op.
...
Change-Id: I36b59fb0c18de1718c8fd2cfe30d713aed59c562
2013-07-30 11:27:55 -07:00
Baligh Uddin
44214d46ec
am 781458b3: (-s ours) am bdf28a18: (-s ours) am 0cb57011: (-s ours) Import translations. DO NOT MERGE
...
* commit '781458b374bf0914ca96993b19f5cc52c572ff65':
Import translations. DO NOT MERGE
2013-07-30 10:28:21 -07:00
Baligh Uddin
0d62b245f5
am 539552e1: (-s ours) am 3ddbe519: (-s ours) Import translations. DO NOT MERGE
...
* commit '539552e17c08359f1c1fd07c8b730854a9c68487':
Import translations. DO NOT MERGE
2013-07-30 10:28:19 -07:00
Baligh Uddin
781458b374
am bdf28a18: (-s ours) am 0cb57011: (-s ours) Import translations. DO NOT MERGE
...
* commit 'bdf28a1892e0116a8d6774d9c9d47033eb354368':
Import translations. DO NOT MERGE
2013-07-30 09:19:30 -07:00
Baligh Uddin
bdf28a1892
am 0cb57011: (-s ours) Import translations. DO NOT MERGE
...
* commit '0cb57011065dd06e5faba2f4d72bbb1d31a3c309':
Import translations. DO NOT MERGE
2013-07-30 09:15:32 -07:00
Baligh Uddin
539552e17c
am 3ddbe519: (-s ours) Import translations. DO NOT MERGE
...
* commit '3ddbe519f44292e33292a9aea08a5894456a3118':
Import translations. DO NOT MERGE
2013-07-30 09:12:51 -07:00
Baligh Uddin
9c93e5ab74
Merge "Import translations. DO NOT MERGE"
2013-07-30 16:09:20 +00:00
Satoshi Kataoka
4e46424761
Merge "Refactor ime settings"
2013-07-30 08:10:58 +00:00
Satoshi Kataoka
993f6ecf40
Refactor ime settings
...
Bug: 8364845
Change-Id: Ie8db248314f2014278e1006b4b37aa64ce76f893
2013-07-30 16:21:27 +09:00
Satoshi Kataoka
1ccd78cd68
Merge "Fix the displayed name of the personal dictionary"
2013-07-30 03:52:42 +00:00
Satoshi Kataoka
4b6603cb79
Fix the displayed name of the personal dictionary
...
Bug: 8976598
Change-Id: I3a8b50790b6da1658f32ff89df222127cb310da6
2013-07-30 12:42:43 +09:00
Robert Greenwalt
7e9d6a8e55
am 5b7bf112: am 35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog"
...
* commit '5b7bf112f55639668b34919dcf2ba19f2cfffaa3':
Fix "Add Network" show last selected WiFi AP Dialog
2013-07-29 16:53:10 -07:00
Robert Greenwalt
5b7bf112f5
am 35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog"
...
* commit '35a2d796e3afbd7c2572c16f5c8655d89078198b':
Fix "Add Network" show last selected WiFi AP Dialog
2013-07-29 16:50:30 -07:00
Robert Greenwalt
35a2d796e3
Merge "Fix "Add Network" show last selected WiFi AP Dialog"
2013-07-29 23:43:33 +00:00
