OSDN Git Service

android-x86/packages-apps-Settings.git
10 years agoam 21cbd017: (-s ours) am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translati...
Baligh Uddin [Mon, 19 Aug 2013 20:06:14 +0000 (13:06 -0700)]
am 21cbd017: (-s ours) am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE

* commit '21cbd017a3201639097cda31c59f769d1cc2b739':
  Import translations. DO NOT MERGE

10 years agoam e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 20:00:36 +0000 (13:00 -0700)]
am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE

* commit 'e37538b122199f316b8b8eb76a6445de6f5c83be':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 19 Aug 2013 19:08:24 +0000 (12:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ice096be39ce880f1a777c969b0bfb7e2987ec888
Auto-generated-cl: translation import

10 years agoMerge "Don't apply encryption password requirements for secondary users" into klp-dev
Amith Yamasani [Fri, 16 Aug 2013 01:04:51 +0000 (01:04 +0000)]
Merge "Don't apply encryption password requirements for secondary users" into klp-dev

10 years agoam a7238c18: (-s ours) am dbf26e70: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:54:13 +0000 (17:54 -0700)]
am a7238c18: (-s ours) am dbf26e70: (-s ours) Import translations. DO NOT MERGE

* commit 'a7238c18b0b5a4500bc0b7a93ddcf4068d45fcd1':
  Import translations. DO NOT MERGE

10 years agoam 8c6de9e0: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:48:11 +0000 (17:48 -0700)]
am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE

* commit '8c6de9e052810aeec7a347bd015e7e8bf2c337cc':
  Import translations. DO NOT MERGE

10 years agoam dbf26e70: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Fri, 16 Aug 2013 00:48:05 +0000 (17:48 -0700)]
am dbf26e70: (-s ours) Import translations. DO NOT MERGE

* commit 'dbf26e70a1f546f9e198a72b2218ae99b015c9e6':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Fri, 16 Aug 2013 00:44:53 +0000 (00:44 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
Zhihai Xu [Fri, 16 Aug 2013 00:22:33 +0000 (00:22 +0000)]
Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev

10 years agoDon't apply encryption password requirements for secondary users
Amith Yamasani [Thu, 15 Aug 2013 22:35:49 +0000 (15:35 -0700)]
Don't apply encryption password requirements for secondary users

Bug: 10314289
Change-Id: I54a54f910c914b41abd3e18963b4bd0c3cddb34a

10 years agoLE: Add support for the HID-over-GATT profile (3/3)
Andre Eisenbach [Fri, 8 Mar 2013 02:05:12 +0000 (18:05 -0800)]
LE: Add support for the HID-over-GATT profile (3/3)

bug:8330048
Change-Id: I0999c3af999939aec88eba4c38bca4358c554e69

10 years agoLinked the recent location apps to battery page
Lifu Tang [Mon, 12 Aug 2013 23:34:45 +0000 (16:34 -0700)]
Linked the recent location apps to battery page

* Extracted BatteryStatsHelper from PowerUsageSummary

* Dropped the "pause" and "resume" method from the
RadioButtonPreference

* Opening battery usage page when the user clicks the recent location
apps item

Change-Id: I5a2d03271434765780154265976d8caa7f8060d8

10 years agoMerge "Shows "App Info" for system apps" into klp-dev
Lifu Tang [Thu, 15 Aug 2013 19:13:42 +0000 (19:13 +0000)]
Merge "Shows "App Info" for system apps" into klp-dev

10 years agoShows "App Info" for system apps
Lifu Tang [Thu, 15 Aug 2013 00:25:12 +0000 (17:25 -0700)]
Shows "App Info" for system apps

If a specific Uid contains only one package, we show the "App Info"
button, even if it's a system app

Change-Id: Ie39b6d90e62ae432c636d50729f0aa45405ce67c

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Aug 2013 21:46:29 +0000 (14:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: I3504c607a35636c6e0455571e9e7006244564b95
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Aug 2013 21:44:15 +0000 (14:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9d761d078fd6bc6a07998e3e439242eab9ea0c14
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 14 Aug 2013 21:42:52 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia45a89a6f426413ccca221aba0d34e597cdb4ec7
Auto-generated-cl: translation import

10 years agoMerge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
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

10 years agoNFC: Allow to get result from tap-pay default dialog.
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

10 years agoMerge "Settings app supports location settings injection" into klp-dev
Tom O'Neill [Wed, 14 Aug 2013 00:30:30 +0000 (00:30 +0000)]
Merge "Settings app supports location settings injection" into klp-dev

10 years agoMerge "Fix bug when sharing to bluetooth." into klp-dev
Maggie Benthall [Tue, 13 Aug 2013 17:00:24 +0000 (17:00 +0000)]
Merge "Fix bug when sharing to bluetooth." into klp-dev

10 years agoFix for TTS settings crash.
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

10 years agoam 508997ad: (-s ours) am 728da455: (-s ours) am 03ae9bf0: (-s ours) Import translati...
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

10 years agoam 728da455: (-s ours) am 03ae9bf0: (-s ours) 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

10 years agoam 08f1d439: (-s ours) am 05404105: (-s ours) 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

10 years agoam 03ae9bf0: (-s ours) 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

10 years agoam 05404105: (-s ours) 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

10 years agoSettings app supports location settings injection
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

10 years agoFix bug when sharing to bluetooth.
Maggie Benthall [Mon, 12 Aug 2013 22:40:45 +0000 (18:40 -0400)]
Fix bug when sharing to bluetooth.

Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoImport translations. DO NOT MERGE
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

10 years agoMerge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
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

10 years agoProc 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

10 years agoBluetooth MAP profile - sms and mms support initial check-in
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

10 years agoInstantiate correct classes for tap&say settings.
Martijn Coenen [Fri, 9 Aug 2013 20:37:38 +0000 (13:37 -0700)]
Instantiate correct classes for tap&say settings.

Change-Id: I59b08fb8093ec1f9798dc41d8069eccdfc0b2098

10 years agoAllow navigation to TrustedCredentials User Certs by intent.
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

10 years agoMerge "Improve process stats UI." into klp-dev
Dianne Hackborn [Fri, 9 Aug 2013 19:13:59 +0000 (19:13 +0000)]
Merge "Improve process stats UI." into klp-dev

10 years agoMerge "Update captioning settings to match final design" 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

10 years agoImprove process stats UI.
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

10 years agoMerge "Fix inconsistent text in Settings>Security>Screen lock" into klp-dev
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

10 years agoFix inconsistent text in Settings>Security>Screen lock
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

10 years agoMerge "Potential fix for Bug: 10241642" into klp-dev
Amith Yamasani [Thu, 8 Aug 2013 23:13:58 +0000 (23:13 +0000)]
Merge "Potential fix for Bug: 10241642" into klp-dev

10 years agoPotential fix for Bug: 10241642
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

10 years agoInitial rough stab at a proc stats UI.
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

10 years agoam 7256942b: (-s ours) am d01ca3ce: (-s ours) Merge "Import translations. DO NOT...
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

10 years agoam f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do...
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.

10 years agoam b4d720f9: (-s ours) am 9a53339d: (-s ours) am e211fd11: (-s ours) Import translati...
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

10 years agoMerge "Developer option to force RTL layout direction" into klp-dev
Amith Yamasani [Thu, 8 Aug 2013 20:46:24 +0000 (20:46 +0000)]
Merge "Developer option to force RTL layout direction" into klp-dev

10 years agoMerge "Modify Power Widget Gps Icon To Represent Location. Instead of directly contro...
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

10 years agoUpdate captioning settings to match final design
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

10 years agoFix a crash in accessibiility settings.
Svetoslav [Thu, 8 Aug 2013 19:35:36 +0000 (12:35 -0700)]
Fix a crash in accessibiility settings.

Change-Id: I27920668191742ab032de7b71c8f71cc35432e9f

10 years agoModify Power Widget Gps Icon To Represent Location.
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

10 years agoDeveloper option to force RTL layout direction
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

10 years agoDisplays a list of most recent location apps
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)

10 years agoMerge "Finished the location settings"
Lifu Tang [Thu, 8 Aug 2013 00:55:39 +0000 (00:55 +0000)]
Merge "Finished the location settings"

10 years agoFinished the location settings
Lifu Tang [Tue, 6 Aug 2013 20:31:50 +0000 (13:31 -0700)]
Finished the location settings

Change-Id: I333fcc74ad387ef6edaa558656d3eaa91feb8fe9

10 years agoMerge "Restriction pin changes."
Jason Monk [Wed, 7 Aug 2013 19:10:42 +0000 (19:10 +0000)]
Merge "Restriction pin changes."

10 years agoRestriction 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

10 years agoam d01ca3ce: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
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

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 7 Aug 2013 17:26:15 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
Baligh Uddin [Wed, 7 Aug 2013 17:24:07 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev

10 years agoReconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
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

10 years agoChange the refresh timing in input method settings
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

10 years agoUse isAsciiCapable when disabling system ime
Satoshi Kataoka [Wed, 7 Aug 2013 08:10:22 +0000 (17:10 +0900)]
Use isAsciiCapable when disabling system ime

Bug: 8364845
Change-Id: I2bb02b0c57b65ac3496b92d379e6d4ff21f338b1

10 years agoImport 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

Conflicts:
res/values-nl/strings.xml
res/values-sw/strings.xml

10 years agoFix issue #10190597: "Any permission restrictions" is displayed after a...
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

10 years agoReset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.

Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11

10 years agoImport 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

10 years agoFix issue #10190597: "Any permission restrictions" is displayed after a...
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

10 years agoam 9a53339d: (-s ours) am e211fd11: (-s ours) Import translations. DO NOT MERGE
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

10 years agoam e211fd11: (-s ours) 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

10 years agoImport 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

10 years agoMerge "NFC payment settings."
Martijn Coenen [Wed, 7 Aug 2013 02:28:40 +0000 (02:28 +0000)]
Merge "NFC payment settings."

10 years agoNFC 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

10 years agoMerge "Display all link IP addresses, on different lines"
Lorenzo Colitti [Wed, 7 Aug 2013 00:32:43 +0000 (00:32 +0000)]
Merge "Display all link IP addresses, on different lines"

10 years agoSingle pane for 10" Settings
Amith Yamasani [Mon, 5 Aug 2013 17:07:23 +0000 (10:07 -0700)]
Single pane for 10" Settings

Change-Id: I960e4be3cfb19ffec4100f8766742d6fb17dda4a

10 years agoMerge "Pin protect more screens."
Geoffrey Borggaard [Tue, 6 Aug 2013 22:03:44 +0000 (22:03 +0000)]
Merge "Pin protect more screens."

10 years agoPin protect more screens.
Geoffrey Borggaard [Fri, 2 Aug 2013 22:16:27 +0000 (18:16 -0400)]
Pin protect more screens.

When these screens are locked down with user restrictions,
it should prompt the user for the restrictions pin before allowing
access to the settings screen.

Change-Id: Iadbb087da2d9470b855ea0bea89f2da1ffb9e854

10 years agoAdd captioning preferences screen
Alan Viverette [Tue, 6 Aug 2013 20:53:58 +0000 (13:53 -0700)]
Add captioning preferences screen

BUG: 9926077
Change-Id: Iea141d5d6fd0e4f134c36c51d89830b3c31abd09

10 years agoMerge "Remove Restrictions UI"
Amith Yamasani [Tue, 6 Aug 2013 18:21:28 +0000 (18:21 +0000)]
Merge "Remove Restrictions UI"

10 years agoRemove Restrictions UI
Amith Yamasani [Tue, 6 Aug 2013 17:46:51 +0000 (10:46 -0700)]
Remove Restrictions UI

Bug: 10200097
Change-Id: Ifaa8aaa9aa5ad17a948bf18f184a131295112a30

10 years agoState that TTS language is not supported if not in available list.
Przemyslaw Szczepaniak [Tue, 6 Aug 2013 12:55:52 +0000 (13:55 +0100)]
State that TTS language is not supported if not in available list.

Bad TTS implementation of isLanguageAvailable may cause settings to
think that given language is available. This change adds additional
check, by searching locale in list of available locales returned
form TTS CheckVoiceData activity.

Bug: 9982002
Change-Id: Ic91cd1218349b8241e3f40f2343df52f3d900544

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 6 Aug 2013 04:46:55 +0000 (21:46 -0700)]
Import translations. DO NOT MERGE

Change-Id: I930e4bf6efae6d8552ccf739970539ff8820079f
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 6 Aug 2013 04:43:40 +0000 (21:43 -0700)]
Import translations. DO NOT MERGE

Change-Id: I271a9cdad27f7f5761cc16e14db5b512902d9b97
Auto-generated-cl: translation import

10 years agoam 9a4f4656: am a5ac281d: am 40557800: Fix issue #10190597: "Any permission restricti...
Dianne Hackborn [Mon, 5 Aug 2013 23:52:32 +0000 (16:52 -0700)]
am 9a4f4656: am a5ac281d: am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after a...

* commit '9a4f4656d752192db96348a488fe4968170eedb5':
  Fix issue #10190597: "Any permission restrictions" is displayed after a...

10 years agoam a5ac281d: am 40557800: Fix issue #10190597: "Any permission restrictions" is displ...
Dianne Hackborn [Mon, 5 Aug 2013 23:49:02 +0000 (16:49 -0700)]
am a5ac281d: am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after a...

* commit 'a5ac281db7103aef790a6141cd72fdbc22835552':
  Fix issue #10190597: "Any permission restrictions" is displayed after a...

10 years agoam 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after...
Dianne Hackborn [Mon, 5 Aug 2013 23:45:48 +0000 (16:45 -0700)]
am 40557800: Fix issue #10190597: "Any permission restrictions" is displayed after a...

* commit '405578009471ab7908af26a813f7d2ef8c072a5c':
  Fix issue #10190597: "Any permission restrictions" is displayed after a...

10 years agoFix issue #10190597: "Any permission restrictions" is displayed after a...
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

10 years agoam fc222b8d: am 8f00b771: Merge "Fix app ops details not displaying permissions under...
Dianne Hackborn [Mon, 5 Aug 2013 18:20:06 +0000 (11:20 -0700)]
am fc222b8d: am 8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions."

* commit 'fc222b8d3aa716fe1596109ea960d57eb3aea1c5':
  Fix app ops details not displaying permissions under certain conditions.

10 years agoam 8f00b771: Merge "Fix app ops details not displaying permissions under certain...
Dianne Hackborn [Mon, 5 Aug 2013 18:15:43 +0000 (11:15 -0700)]
am 8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions."

* commit '8f00b7711c48a102a70f9b7e6a563aa14b79f5a5':
  Fix app ops details not displaying permissions under certain conditions.

10 years agoReset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.

Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11

10 years agoMerge "Fix app ops details not displaying permissions under certain conditions."
Dianne Hackborn [Mon, 5 Aug 2013 18:11:11 +0000 (18:11 +0000)]
Merge "Fix app ops details not displaying permissions under certain conditions."

10 years agoMerge "Add some missing fragments to the whitelist"
Amith Yamasani [Mon, 5 Aug 2013 18:04:22 +0000 (18:04 +0000)]
Merge "Add some missing fragments to the whitelist"

10 years agoAdd some missing fragments to the whitelist
Amith Yamasani [Mon, 5 Aug 2013 18:02:16 +0000 (11:02 -0700)]
Add some missing fragments to the whitelist

Bug: 10184429
Change-Id: I4b4da5d5f2f4ec64992012e9d15799d195870a8a

10 years agoFix app ops details not displaying permissions under certain conditions.
Danny Baumann [Mon, 5 Aug 2013 12:28:58 +0000 (14:28 +0200)]
Fix app ops details not displaying permissions under certain conditions.

If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.

Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb

10 years agoDisable TTS "Listen to the example" if not supported
Przemyslaw Szczepaniak [Fri, 2 Aug 2013 16:06:41 +0000 (17:06 +0100)]
Disable TTS "Listen to the example" if not supported

If current TTS locale (most of the cases same as device locale) is
not supported by the TTS engine, field for setting synthesis speed
and "Listen to the example" will be disabled.

Added new field, "Default language status" to indicate level of support
for currently selected language. It can take one of three messages:
%s is fully supported
%s requires network connection
%s is not supported
Where %s is locale display name.

Added example string that will provide a fallback for example text
if not provided by Settings or TTS engine.

Change-Id: Ia2a920a71197a85d3812fc8df9dfed4ebe6b515f
Bug: 9982002

10 years agoam ad38b60b: am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 07:10:16 +0000 (00:10 -0700)]
am ad38b60b: am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.

* commit 'ad38b60b372314f6266381207bd82144f21b1027':
  Reset app preferences now resets all app ops.

10 years agoam 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 02:32:14 +0000 (19:32 -0700)]
am 0a09b13c: am a6683e0f: Reset app preferences now resets all app ops.

* commit '0a09b13c81bb0ebe556e46e3859a25805b2cbdcf':
  Reset app preferences now resets all app ops.

10 years agoam a6683e0f: Reset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 02:30:09 +0000 (19:30 -0700)]
am a6683e0f: Reset app preferences now resets all app ops.

* commit 'a6683e0f4af75005ab5a1742d30df4bee071f725':
  Reset app preferences now resets all app ops.