PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,945 Commits 1 Branch 0 Tags
f2ae4cb731a2bc45db3060fa84d372dbc3358909
Commit Graph

7262 Commits

Author SHA1 Message Date
Geoff Mendal
eea96f22a1 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 23037720
Change-Id: I2349611e7f02b8e06ac12a4c86573711c6ff6a0e
 2015-08-12 21:50:09 -07:00
Dianne Hackborn
cd2b9e1217 am 2be290cf: am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '2be290cf36f06da260e67b430a625422da512609':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:09:10 +00:00
Dianne Hackborn
2be290cf36 am 6a1e1e08: am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit '6a1e1e08a0b5f671a1054b9a46f1e0c0a90738c4':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 01:02:23 +00:00
Dianne Hackborn
6a1e1e08a0 am f67d0785: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 
* commit 'f67d0785d006677d2fba3f2192f3f6ea824c5336':
  Fix issue #23116383: Include security patch level in Settings
 2015-08-13 00:54:31 +00:00
Dianne Hackborn
f67d0785d0 Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Dianne Hackborn
b9a8e277d9 Fix issue #23116383: Include security patch level in Settings 
Change-Id: I003564376a02a70f0245353472544cde355240ac
 2015-08-12 16:11:46 -07:00
Geoff Mendal
42ae7fba5b Import translations. DO NOT MERGE 
Change-Id: Id1b064096c8580892f747af1c02e46ad5b897671
Auto-generated-cl: translation import
 2015-08-12 07:00:45 -07:00
Dianne Hackborn
0f440a701c am 540afe77: am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 
* commit '540afe774a201dc3a1ab4fff49c340bdb5b1fb8d':
  Fix issue #23079119: Description for write settings permission says...
 2015-08-11 23:48:49 +00:00
Dianne Hackborn
540afe774a am e2e76435: am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 
* commit 'e2e76435f4a0604d751b32838409421b072ca25d':
  Fix issue #23079119: Description for write settings permission says...
 2015-08-11 23:39:23 +00:00
Maurice Lam
d217463629 am 4797364d: am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 
* commit '4797364d8ac175b3322f7adcb5963602f2bb18d0':
  [Fingerprint] Use different ring size for setup
 2015-08-11 23:27:00 +00:00
Dianne Hackborn
e2e76435f4 am 8500822b: Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 
* commit '8500822b8e39473e272a0c4e84349aa9dadf763f':
  Fix issue #23079119: Description for write settings permission says...
 2015-08-11 23:26:45 +00:00
Dianne Hackborn
8500822b8e Merge "Fix issue #23079119: Description for write settings permission says..." into mnc-dev 2015-08-11 23:17:24 +00:00
Maurice Lam
4797364d8a am a430ac56: am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 
* commit 'a430ac56b22da424abeda82ca074ef19d5e9cd56':
  [Fingerprint] Use different ring size for setup
 2015-08-11 23:15:33 +00:00
Maurice Lam
a430ac56b2 am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 
* commit '3d9cb9261849d8178ce834c8216fe2154db4e5af':
  [Fingerprint] Use different ring size for setup
 2015-08-11 22:43:35 +00:00
Maurice Lam
3d9cb92618 Merge "[Fingerprint] Use different ring size for setup" into mnc-dev 2015-08-11 22:35:53 +00:00
Dianne Hackborn
4f8b829b24 Fix issue #23079119: Description for write settings permission says... 
...it is for read and write

Just write.

And let's say, modify.

Change-Id: If901bab36888674d5a6e8c5979ec190b64aff18e
 2015-08-11 12:17:59 -07:00
Jason Monk
31227bfaf1 am bce29c8a: am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit 'bce29c8a012a27d4cd4ca87892d215e29a793fa7':
  Add setting to disable camera gesture
 2015-08-11 14:08:02 +00:00
Jason Monk
bce29c8a01 am 746886c5: Merge "Add setting to disable camera gesture" into mnc-dr-dev 
* commit '746886c59a20dc33d62c2dd500fd27edcf0abcca':
  Add setting to disable camera gesture
 2015-08-11 14:02:37 +00:00
Jason Monk
746886c59a Merge "Add setting to disable camera gesture" into mnc-dr-dev 2015-08-11 13:55:54 +00:00
Dianne Hackborn
c262c522ae am 6fcacc41: am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit '6fcacc41273a195dfa0f4cbca93c4eafe32edd1d':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:27:06 +00:00
Dianne Hackborn
6fcacc4127 am fc7633ca: am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'fc7633cae2aec30f32adbc26d3e24a8005e773f5':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:19:07 +00:00
Dianne Hackborn
fc7633cae2 am ba38155d: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'ba38155d257aa00e0dabb9cf9eefc1a281278a14':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-11 00:11:09 +00:00
Dianne Hackborn
9bedd25c77 Fix issue #23037720: New Battery Optimization Strings 
No, really, these are the strings.

Change-Id: Ibe94b5251934a1d855974d846f3de6bdb314c7e9
 2015-08-10 17:03:38 -07:00
Geoff Mendal
41abf66362 Import translations. DO NOT MERGE 
Change-Id: If91d4ed788fe61f16f68cdc2fb8c1d1a6ca39721
Auto-generated-cl: translation import
 2015-08-10 07:03:46 -07:00
Geoff Mendal
3ca58bbda3 Import translations. DO NOT MERGE 
Change-Id: I49911941b08daff0dce1d0ec3ca9b21ae209650b
Auto-generated-cl: translation import
 2015-08-08 07:26:58 -07:00
Dianne Hackborn
a3e6657658 am 1ded4413: am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit '1ded441390e79dc46d576dadbbf1a69da12d399d':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-07 22:20:50 +00:00
Dianne Hackborn
1ded441390 am 7a3a4533: am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit '7a3a453349fb51043d84adc21f87472ba34c49a8':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-07 22:12:58 +00:00
Dianne Hackborn
7a3a453349 am e7a5966a: Merge "Fix issue #23037720: New Battery Optimization Strings" into mnc-dev 
* commit 'e7a5966aa72a7a64358e4092fa3fe2b46b28c420':
  Fix issue #23037720: New Battery Optimization Strings
 2015-08-07 22:05:56 +00:00
Dianne Hackborn
f5497aa93c Fix issue #23037720: New Battery Optimization Strings 
Thar be strings.

Change-Id: Ieb43d041912cc5d2cc181d3232e01dbfce6cbc0e
 2015-08-07 14:43:55 -07:00
Maurice Lam
d62aabf10d [Fingerprint] Use different ring size for setup 
Follow-up on ag/741340, to split the size of the fingerprint ring
during setup vs in settings. The ring in settings is slightly bigger
because the header is smaller and the error text will not be cropped.

Bug: 22924280
Change-Id: I4b9a817c85a3683924a01e41552ca80c85423f29
 2015-08-07 10:48:48 -07:00
Geoff Mendal
2d546b77b9 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22879473
Bug: 22719051
Change-Id: Ic6f0352135604d3a4d02ecfc9713f21191b046fd
 2015-08-07 04:21:22 +00:00
Geoff Mendal
90c2297645 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c
 2015-08-05 18:24:49 -07:00
Geoff Mendal
7930f872ad Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa
 2015-08-05 18:15:07 -07:00
Geoff Mendal
093f37469a Import translations. DO NOT MERGE 
Change-Id: Ib3414d2601d5e614e1a25823c238e8f124fc8e11
Auto-generated-cl: translation import
 2015-08-05 07:05:39 -07:00
Maurice Lam
311a2d9525 Merge "[Fingerprint] Update string for enrolling" into mnc-dev 2015-08-05 00:38:37 +00:00
Maurice Lam
c781bf30ad am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev 
* commit 'e8f7ed9ea0ece56f58d5ea187ec00f01da54a2bf':
  [Fingerprint] Shrink fingerprint progress ring
 2015-08-05 00:35:27 +00:00
Maurice Lam
e8f7ed9ea0 am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev 
* commit '2a74b8623816b961f3da7f45f080e61067f951e6':
  [Fingerprint] Shrink fingerprint progress ring
 2015-08-05 00:27:22 +00:00
Maurice Lam
2a74b86238 am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev 
* commit '8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
  [Fingerprint] Shrink fingerprint progress ring
 2015-08-05 00:20:06 +00:00
Maurice Lam
8c9136efce Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev 2015-08-05 00:09:32 +00:00
Maurice Lam
54a34ac6f9 am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling 
* commit '6eb6f924ac02afa004ea15ccbeecdd16c152b222':
  [Fingerprint] Update string for enrolling
 2015-08-04 23:43:00 +00:00
Maurice Lam
6eb6f924ac am c48ea1f5: [Fingerprint] Update string for enrolling 
* commit 'c48ea1f5864b8f4d58eebd28173cff655193c70a':
  [Fingerprint] Update string for enrolling
 2015-08-04 23:36:09 +00:00
Maurice Lam
c48ea1f586 [Fingerprint] Update string for enrolling 
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.

Also include other minor update to strings mentioned in the bug.

Bug: 22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
 2015-08-04 23:08:10 +00:00
Maurice Lam
289151ccea [Fingerprint] Update string for enrolling 
Update string for enrolling to tell the user to move their fingers,
so that different parts of their fingerprints can be captured.

Also include other minor update to strings mentioned in the bug.

Bug: 22719051
Change-Id: Idd3c69d4476d240c9ef81e8c82b7ae9fcb390a41
 2015-08-04 15:44:42 -07:00
Maurice Lam
42b6ad595b [Fingerprint] Shrink fingerprint progress ring 
Make the fingerprint progress ring smaller so that the error message
can be seen on Nexus 5 during setup.

Bug: 22924280
Change-Id: Ic8a70e1fa6f2dd33d1c7c239e32d3eb3a92cc187
 2015-08-04 15:06:26 -07:00
Jason Monk
ddb2277810 am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev 
* commit 'bd776a0bb70b1956e3b7332fb75378df85b04a60':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
 2015-08-04 20:55:37 +00:00
Jason Monk
bd776a0bb7 am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev 
* commit '9824c5da1efa9750fb19d477d29875a08289ecf5':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER
 2015-08-04 20:43:01 +00:00
Jason Monk
9824c5da1e resolved conflicts for merge of 1adca55f to mnc-dr-dev 
Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c
 2015-08-04 16:23:32 -04:00
Nick Kralevich
1adca55ffe Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev 2015-08-04 19:45:58 +00:00
Jason Monk
d2af085950 am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev 
* commit '661d1b778828b79851b9ab7fb5d73cf8d3044aa8':
  Update USB dialog for USB-C power option
 2015-08-04 18:06:19 +00:00
Jason Monk
661d1b7788 am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev 
* commit '2e3775b9b143311da66b91c6f1291a4639236d07':
  Update USB dialog for USB-C power option
 2015-08-04 17:57:14 +00:00