OSDN Git Service
Robert Greenwalt [Thu, 15 Aug 2013 14:19:36 +0000 (07:19 -0700)]
am
a1fa7cef: am
1faefa06: Merge "Fix one NPE in tethering setting"
* commit '
a1fa7cef5d88d0f515efa07d0f7274c41fa6d712':
Fix one NPE in tethering setting
Robert Greenwalt [Thu, 15 Aug 2013 14:17:11 +0000 (07:17 -0700)]
am
1faefa06: Merge "Fix one NPE in tethering setting"
* commit '
1faefa06a3a742123af8ea5be5bbfb730db16c7c':
Fix one NPE in tethering setting
Robert Greenwalt [Thu, 15 Aug 2013 14:13:09 +0000 (14:13 +0000)]
Merge "Fix one NPE in tethering setting"
Jianzheng Zhou [Thu, 15 Aug 2013 06:34:52 +0000 (14:34 +0800)]
Fix one NPE in tethering setting
Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.
Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
The Android Open Source Project [Wed, 14 Aug 2013 21:25:51 +0000 (14:25 -0700)]
Reconcile with klp-release - do not merge
Change-Id: Ibab39b9c65854cd80f8b125eace08eea87fb4a95
Martijn Coenen [Wed, 14 Aug 2013 16:00:01 +0000 (09:00 -0700)]
am
fcfd865d: Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
* commit '
fcfd865d5c1f2e20952d64196922840a63e83411':
NFC: Allow to get result from tap-pay default dialog.
Martijn Coenen [Wed, 14 Aug 2013 15:58:06 +0000 (15:58 +0000)]
Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
Martijn Coenen [Wed, 14 Aug 2013 15:57:11 +0000 (08:57 -0700)]
NFC: Allow to get result from tap-pay default dialog.
Change-Id: Ic9e88dca5577a4f553dca56e0ff387c1e96f2ed2
The Android Automerger [Wed, 14 Aug 2013 13:06:53 +0000 (06:06 -0700)]
merge in klp-release history after reset to klp-dev
Tom O'Neill [Wed, 14 Aug 2013 00:34:20 +0000 (17:34 -0700)]
am
cabe7e82: Merge "Settings app supports location settings injection" into klp-dev
* commit '
cabe7e821886f560e2bff7d2528069308458dc98':
Settings app supports location settings injection
Tom O'Neill [Wed, 14 Aug 2013 00:30:30 +0000 (00:30 +0000)]
Merge "Settings app supports location settings injection" into klp-dev
Maggie Benthall [Mon, 12 Aug 2013 22:40:45 +0000 (18:40 -0400)]
Fix bug when sharing to bluetooth.
Bug:
10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 12:05:48 +0000 (13:05 +0100)]
Fix for TTS settings crash.
Play an example is wrongly enabled before TTS engine is initialized.
Bug:
10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
Maggie Benthall [Tue, 13 Aug 2013 17:04:09 +0000 (10:04 -0700)]
am
cd3eb97c: Merge "Fix bug when sharing to bluetooth." into klp-dev
* commit '
cd3eb97ce57e9811cb7129d4d493a08480e9a56e':
Fix bug when sharing to bluetooth.
Maggie Benthall [Tue, 13 Aug 2013 17:00:24 +0000 (17:00 +0000)]
Merge "Fix bug when sharing to bluetooth." into klp-dev
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 13:43:09 +0000 (06:43 -0700)]
am
0e01f128: Fix for TTS settings crash.
* commit '
0e01f128ab8a8525a4d3fd72980e468f4de1e56c':
Fix for TTS settings crash.
The Android Automerger [Tue, 13 Aug 2013 13:04:16 +0000 (06:04 -0700)]
merge in klp-release history after reset to klp-dev
Przemyslaw Szczepaniak [Tue, 13 Aug 2013 12:05:48 +0000 (13:05 +0100)]
Fix for TTS settings crash.
Play an example is wrongly enabled before TTS engine is initialized.
Bug:
10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
Baligh Uddin [Tue, 13 Aug 2013 07:53:52 +0000 (00:53 -0700)]
am
0782e629: (-s ours) am
508997ad: (-s ours) am
728da455: (-s ours) am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
0782e6293bec6f51e5ecd23525f945823e5b4632':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:48:30 +0000 (00:48 -0700)]
am
508997ad: (-s ours) am
728da455: (-s ours) am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
508997ad0729e16eb04c475f9be3e33ca5ed60cf':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:47:21 +0000 (00:47 -0700)]
am
fff94ce8: (-s ours) am
08f1d439: (-s ours) am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
fff94ce8cc24861de614bedb193e926e62179e04':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:45:32 +0000 (00:45 -0700)]
am
728da455: (-s ours) am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
728da4558087e5b3fe25fad7eedb4f5de5c4068f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:44:04 +0000 (00:44 -0700)]
am
08f1d439: (-s ours) am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
08f1d439c7a278b0cd9afd60f2ba41e846f40543':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:43:55 +0000 (00:43 -0700)]
am
a45cd5a6: (-s ours) Import translations. DO NOT MERGE
* commit '
a45cd5a60ef71e70c4d4530370f46766d517541a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:42:15 +0000 (00:42 -0700)]
am
03ae9bf0: (-s ours) Import translations. DO NOT MERGE
* commit '
03ae9bf0e90c02ec1afcd13c9993d2d9672eb36f':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 13 Aug 2013 07:42:11 +0000 (00:42 -0700)]
am
05404105: (-s ours) Import translations. DO NOT MERGE
* commit '
054041058f9706c95b3d72ca421fcb656ad59d1e':
Import translations. DO NOT MERGE
Tom O'Neill [Mon, 12 Aug 2013 23:22:48 +0000 (16:22 -0700)]
Settings app supports location settings injection
- Partial fix for b/
10287745
Change-Id: Ia5eb05670957125e70717c86a686a54b77b22455
Maggie Benthall [Mon, 12 Aug 2013 22:40:45 +0000 (18:40 -0400)]
Fix bug when sharing to bluetooth.
Bug:
10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
Baligh Uddin [Mon, 12 Aug 2013 18:51:11 +0000 (11:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6770486a959f0bd90fe6621ba8e6348f7f5381f0
Auto-generated-cl: translation import
Baligh Uddin [Mon, 12 Aug 2013 18:48:59 +0000 (11:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic75004da530d9dd114beb02d72928b2204f07b0e
Auto-generated-cl: translation import
Baligh Uddin [Mon, 12 Aug 2013 18:47:40 +0000 (11:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1f8effde31afbf4145ae6b234f0e02e08f9cb882
Auto-generated-cl: translation import
The Android Automerger [Mon, 12 Aug 2013 13:02:34 +0000 (06:02 -0700)]
merge in klp-release history after reset to klp-dev
Zhihai Xu [Sat, 10 Aug 2013 01:49:59 +0000 (18:49 -0700)]
am
6ee5b450: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
* commit '
6ee5b4508083fd0dd340396d66927c0fc8870a9b':
Bluetooth MAP profile - sms and mms support initial check-in
Zhihai Xu [Sat, 10 Aug 2013 01:46:22 +0000 (01:46 +0000)]
Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
Dianne Hackborn [Fri, 9 Aug 2013 23:38:11 +0000 (16:38 -0700)]
am
a582a051: Proc stats UI improvements.
* commit '
a582a051951be9b1afd57e05fd6a405bccd9a46f':
Proc stats UI improvements.
Dianne Hackborn [Fri, 9 Aug 2013 23:17:27 +0000 (16:17 -0700)]
Proc stats UI improvements.
Now have a chart showing the memory state, and text showing the
current memory state. Trying to do better at picking the application
to blame for a process hosting multiple apps. Start of infrastructure
for more detailed reporting.
Change-Id: I93ca7ecf2fd0bc01e3be8d28b80212ac78fe7607
Matthew Xie [Fri, 19 Jul 2013 00:16:27 +0000 (17:16 -0700)]
Bluetooth MAP profile - sms and mms support initial check-in
bug:
10116530
Change-Id: I3f50e66420e53bf21a1ecba06aed6b8261ff3064
Martijn Coenen [Fri, 9 Aug 2013 22:22:19 +0000 (15:22 -0700)]
am
53083ab2: Instantiate correct classes for tap&say settings.
* commit '
53083ab2bbcadf7f1bcbefbaa2e4ee5c85349d84':
Instantiate correct classes for tap&say settings.
Geoffrey Borggaard [Fri, 9 Aug 2013 22:22:15 +0000 (15:22 -0700)]
am
fc6bc201: Allow navigation to TrustedCredentials User Certs by intent.
* commit '
fc6bc20161edea9e93a7abcd82af5c26870c58bb':
Allow navigation to TrustedCredentials User Certs by intent.
Dianne Hackborn [Fri, 9 Aug 2013 22:22:08 +0000 (15:22 -0700)]
am
f3796d0b: Merge "Improve process stats UI." into klp-dev
* commit '
f3796d0bf8bfa3a0e4359dcdf4017961bd312dea':
Improve process stats UI.
Alan Viverette [Fri, 9 Aug 2013 22:22:05 +0000 (15:22 -0700)]
am
c0f79432: Merge "Update captioning settings to match final design" into klp-dev
* commit '
c0f79432cff613e993a86bece93ab1ef674d9054':
Update captioning settings to match final design
Martijn Coenen [Fri, 9 Aug 2013 20:37:38 +0000 (13:37 -0700)]
Instantiate correct classes for tap&say settings.
Change-Id: I59b08fb8093ec1f9798dc41d8069eccdfc0b2098
Geoffrey Borggaard [Fri, 9 Aug 2013 15:44:42 +0000 (11:44 -0400)]
Allow navigation to TrustedCredentials User Certs by intent.
Adds an activity, and an entry in the AndroidManifest.xml
Change-Id: Ic3cfa1f3bdc3f2eefc290195679011c224496d63
Dianne Hackborn [Fri, 9 Aug 2013 19:13:59 +0000 (19:13 +0000)]
Merge "Improve process stats UI." into klp-dev
Alan Viverette [Fri, 9 Aug 2013 19:11:25 +0000 (19:11 +0000)]
Merge "Update captioning settings to match final design" into klp-dev
Dianne Hackborn [Fri, 9 Aug 2013 19:08:54 +0000 (12:08 -0700)]
Improve process stats UI.
Now roll up multiple process stats to have at least a
day of data, change the visualization to have the bars show
"weight" (duration*pss) and the text the percent of total
time running, add label to show how much time the stats
are over.
Change-Id: I73763cb6a66d03d856ea4bf517eac0fe39c79c52
Amith Yamasani [Fri, 9 Aug 2013 00:31:23 +0000 (17:31 -0700)]
am
2f219c51: Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
* commit '
2f219c51ad2151c9d31912d836276679e0dd747d':
Fix inconsistent text in Settings>Security>Screen lock
Amith Yamasani [Fri, 9 Aug 2013 00:28:48 +0000 (00:28 +0000)]
Merge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
Amith Yamasani [Fri, 9 Aug 2013 00:27:23 +0000 (17:27 -0700)]
Fix inconsistent text in Settings>Security>Screen lock
Bug:
10157179
Change-Id: Ib508b161d87248679fb9b8f3dae1584f73f18dcb
Amith Yamasani [Thu, 8 Aug 2013 23:17:51 +0000 (16:17 -0700)]
am
a42cacb3: Merge "Potential fix for Bug:
10241642" into klp-dev
* commit '
a42cacb34b8b6a5c9c0fd1b6c1ba63a121658d6f':
Potential fix for Bug:
10241642
Amith Yamasani [Thu, 8 Aug 2013 23:13:58 +0000 (23:13 +0000)]
Merge "Potential fix for Bug:
10241642" into klp-dev
Amith Yamasani [Thu, 8 Aug 2013 23:06:39 +0000 (16:06 -0700)]
Potential fix for Bug:
10241642
Check if the fragment is running before handling click.
Change-Id: I78ab3db5c5d0b3e041cff7525239698c361fd5fb
Dianne Hackborn [Thu, 8 Aug 2013 23:06:21 +0000 (16:06 -0700)]
am
c6d658e3: Initial rough stab at a proc stats UI.
* commit '
c6d658e37d7c0ab2d264fff4850ea20823669558':
Initial rough stab at a proc stats UI.
Baligh Uddin [Thu, 8 Aug 2013 22:56:12 +0000 (15:56 -0700)]
am
dcd15ee0: (-s ours) am
7256942b: (-s ours) am
d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
dcd15ee04bf30f3400c9e5f790ff543bed83734a':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 8 Aug 2013 22:56:11 +0000 (15:56 -0700)]
am
76cbd841: am
f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
76cbd841931d0de490f4f63c467d6bbdd0feb057':
Import translations. DO NOT MERGE
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Import translations. DO NOT MERGE
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Revert "Completely remove app ops activity."
Completely remove app ops activity.
Baligh Uddin [Thu, 8 Aug 2013 22:56:11 +0000 (15:56 -0700)]
am
ff2aed99: (-s ours) am
b4d720f9: (-s ours) am
9a53339d: (-s ours) am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
ff2aed99fcc0656c5d5dd989ddd373834631286c':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 8 Aug 2013 22:52:33 +0000 (15:52 -0700)]
am
82f7c064: Merge "Developer option to force RTL layout direction" into klp-dev
* commit '
82f7c064483732c925dfd12547bd32ffac211cd5':
Developer option to force RTL layout direction
David Christie [Thu, 8 Aug 2013 22:52:33 +0000 (15:52 -0700)]
am
b8fa4d9f: Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
* commit '
b8fa4d9fe85c7513a8a5d9b1b6bcf3b8e5473849':
Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off.
Svetoslav [Thu, 8 Aug 2013 22:52:32 +0000 (15:52 -0700)]
am
3f257c4d: Fix a crash in accessibiility settings.
* commit '
3f257c4dfba2acc2d61b91baf4f69524a1dc02af':
Fix a crash in accessibiility settings.
Lifu Tang [Thu, 8 Aug 2013 22:51:21 +0000 (15:51 -0700)]
am
88afb32f: Displays a list of most recent location apps
* commit '
88afb32fc6422139dcf8340aa88f3de9112a1485':
Displays a list of most recent location apps
Lifu Tang [Thu, 8 Aug 2013 22:51:20 +0000 (15:51 -0700)]
am
b14698ee: Merge "Finished the location settings"
* commit '
b14698ee6063960d48a691add890a5072f89ea2e':
Finished the location settings
Jason Monk [Thu, 8 Aug 2013 22:51:20 +0000 (15:51 -0700)]
am
71decb7b: Merge "Restriction pin changes."
* commit '
71decb7b072d69613083285cee6014d37b2e6ef8':
Restriction pin changes.
Baligh Uddin [Thu, 8 Aug 2013 22:51:19 +0000 (15:51 -0700)]
am
7494ff47: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '
7494ff47aa1e756285810a73a2488af65f2d4cda':
Import translations. DO NOT MERGE
Dianne Hackborn [Thu, 8 Aug 2013 19:57:53 +0000 (12:57 -0700)]
Initial rough stab at a proc stats UI.
You see procs, and you see some stats.
Change-Id: I91c86d198fd5e64a41c72901e150466b3c602caf
Baligh Uddin [Thu, 8 Aug 2013 21:14:17 +0000 (14:14 -0700)]
am
7256942b: (-s ours) am
d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
7256942bb757bfaa14db128386c0ecb363b26935':
Import translations. DO NOT MERGE
The Android Open Source Project [Thu, 8 Aug 2013 21:14:12 +0000 (14:14 -0700)]
am
f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
f4316f6d5b9a87cd366af4f0f22ab8713ac1b8ad':
Import translations. DO NOT MERGE
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Import translations. DO NOT MERGE
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Revert "Completely remove app ops activity."
Completely remove app ops activity.
Baligh Uddin [Thu, 8 Aug 2013 21:14:02 +0000 (14:14 -0700)]
am
b4d720f9: (-s ours) am
9a53339d: (-s ours) am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
b4d720f9d739f5618d6acef9bd87837700c908eb':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 8 Aug 2013 20:46:24 +0000 (20:46 +0000)]
Merge "Developer option to force RTL layout direction" into klp-dev
David Christie [Thu, 8 Aug 2013 20:19:05 +0000 (20:19 +0000)]
Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
Alan Viverette [Thu, 8 Aug 2013 17:38:50 +0000 (10:38 -0700)]
Update captioning settings to match final design
BUG:
9926077
Change-Id: I058c05643f33aca89327f23bcdee53dd8afb3bbb
Svetoslav [Thu, 8 Aug 2013 19:35:36 +0000 (12:35 -0700)]
Fix a crash in accessibiility settings.
Change-Id: I27920668191742ab032de7b71c8f71cc35432e9f
David Christie [Wed, 7 Aug 2013 01:20:33 +0000 (18:20 -0700)]
Modify Power Widget Gps Icon To Represent Location.
Instead of directly controlling gps on/off, it will
control master location switch on/off.
Change-Id: I12a20fb77c12b5099172167821ff7ed00ba9ea7c
Amith Yamasani [Thu, 8 Aug 2013 03:14:44 +0000 (20:14 -0700)]
Developer option to force RTL layout direction
Sets a global setting and system property and forces a config change
when developer selects to force RTL screen layout direction.
Bug:
10244047
Change-Id: Id91e52be5e492515ff1eef3cbccfb08e944bfc92
Lifu Tang [Wed, 7 Aug 2013 18:18:16 +0000 (11:18 -0700)]
Displays a list of most recent location apps
Change-Id: I8e34ca8c30f308744022f17fac2444a496abd9e6
(cherry picked from commit
16ab0eca74751c331c1c74612548a27735a450b7)
The Android Automerger [Thu, 8 Aug 2013 14:54:29 +0000 (07:54 -0700)]
merge in klp-release history after reset to klp-dev
Lifu Tang [Thu, 8 Aug 2013 00:55:39 +0000 (00:55 +0000)]
Merge "Finished the location settings"
Lifu Tang [Tue, 6 Aug 2013 20:31:50 +0000 (13:31 -0700)]
Finished the location settings
Change-Id: I333fcc74ad387ef6edaa558656d3eaa91feb8fe9
Geoffrey Borggaard [Wed, 7 Aug 2013 18:57:43 +0000 (14:57 -0400)]
Restriction pin changes.
Fixed bug in WirelessSettings where it was asking users for a PIN when
they weren't restricted. Did this by refactoring the preference level
pin checking into the superclass, where it checks for the restricted mode first.
Also pin protected changes to certificates for restricted users.
Change-Id: I8310fd39f0862159668318fc1360ec6859cc00d5
Jason Monk [Wed, 7 Aug 2013 19:10:42 +0000 (19:10 +0000)]
Merge "Restriction pin changes."
Geoffrey Borggaard [Wed, 7 Aug 2013 18:57:43 +0000 (14:57 -0400)]
Restriction pin changes.
Fixed bug in WirelessSettings where it was asking users for a PIN when
they weren't restricted. Did this by refactoring the preference level
pin checking into the superclass, where it checks for the restricted mode first.
Also pin protected changes to certificates for restricted users.
Change-Id: I8310fd39f0862159668318fc1360ec6859cc00d5
Baligh Uddin [Wed, 7 Aug 2013 17:28:43 +0000 (10:28 -0700)]
am
d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
* commit '
d01ca3ce4a5b93dc0dad46ad0674d6b28d89b0ee':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Aug 2013 17:26:15 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 7 Aug 2013 17:24:07 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
The Android Open Source Project [Wed, 7 Aug 2013 16:43:18 +0000 (09:43 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I84e2f72513f3087ff4628a838efcf471e3695934
The Android Automerger [Wed, 7 Aug 2013 13:01:11 +0000 (06:01 -0700)]
merge in klp-release history after reset to master
Satoshi Kataoka [Mon, 5 Aug 2013 09:00:49 +0000 (18:00 +0900)]
Change the refresh timing in input method settings
Bug:
8364845
Change-Id: I564a4b0d80cec5be670e2ca89e09d45944671082
Satoshi Kataoka [Wed, 7 Aug 2013 08:10:22 +0000 (17:10 +0900)]
Use isAsciiCapable when disabling system ime
Bug:
8364845
Change-Id: I2bb02b0c57b65ac3496b92d379e6d4ff21f338b1
Baligh Uddin [Wed, 7 Aug 2013 02:55:54 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
Conflicts:
res/values-nl/strings.xml
res/values-sw/strings.xml
Dianne Hackborn [Mon, 5 Aug 2013 23:23:58 +0000 (16:23 -0700)]
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
...newline in "Reset app preferences" dialog
Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Baligh Uddin [Wed, 7 Aug 2013 02:55:54 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
Dianne Hackborn [Mon, 5 Aug 2013 23:23:58 +0000 (16:23 -0700)]
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
...newline in "Reset app preferences" dialog
Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
Baligh Uddin [Wed, 7 Aug 2013 03:05:46 +0000 (20:05 -0700)]
am
9a53339d: (-s ours) am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
9a53339dd6ea5c683629a5fff8837e7e59581680':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Aug 2013 03:04:13 +0000 (20:04 -0700)]
am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
e211fd11c65c7db4e0225c774519604efa98889c':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Aug 2013 02:55:54 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
Martijn Coenen [Wed, 7 Aug 2013 02:28:40 +0000 (02:28 +0000)]
Merge "NFC payment settings."
Martijn Coenen [Fri, 2 Aug 2013 01:13:33 +0000 (18:13 -0700)]
NFC payment settings.
First version, pending final UX.
Change-Id: I357e900c3f2012b35814ae197c49a8c9b97b7148
Lorenzo Colitti [Wed, 7 Aug 2013 00:32:43 +0000 (00:32 +0000)]
Merge "Display all link IP addresses, on different lines"
Amith Yamasani [Mon, 5 Aug 2013 17:07:23 +0000 (10:07 -0700)]
Single pane for 10" Settings
Change-Id: I960e4be3cfb19ffec4100f8766742d6fb17dda4a
Amith Yamasani [Tue, 6 Aug 2013 17:46:51 +0000 (10:46 -0700)]
Remove Restrictions UI
Bug:
10200097
Change-Id: Ifaa8aaa9aa5ad17a948bf18f184a131295112a30
OSDN Git Service
