OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 8c35777f: (-s ours) am 79aed477: (-s ours) am 05facd93: (-s ours) am 18d86828...
Geoff Mendal [Thu, 6 Aug 2015 04:42:23 +0000 (04:42 +0000)]
am 8c35777f: (-s ours) am 79aed477: (-s ours) am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 79aed477: (-s ours) am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872...
Geoff Mendal [Thu, 6 Aug 2015 04:38:14 +0000 (04:38 +0000)]
am 79aed477: (-s ours) am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '79aed4774745113f5b110fcfd82a3ee64ff6ecc1':
  Import translations. DO NOT MERGE

9 years agoam a7a0e552: (-s ours) am 870ba029: (-s ours) am 40f6e9ab: (-s ours) am 90c22976...
Geoff Mendal [Thu, 6 Aug 2015 04:33:27 +0000 (04:33 +0000)]
am a7a0e552: (-s ours) am 870ba029: (-s ours) am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translati...
Geoff Mendal [Thu, 6 Aug 2015 04:32:56 +0000 (04:32 +0000)]
am 05facd93: (-s ours) am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '05facd935a44d882ca6f5e0ee7b3b1cffd1c0ad4':
  Import translations. DO NOT MERGE

9 years agoam 870ba029: (-s ours) am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translati...
Geoff Mendal [Thu, 6 Aug 2015 04:29:29 +0000 (04:29 +0000)]
am 870ba029: (-s ours) am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '870ba02933fa364660384944fa13ac0a94cab1b5':
  Import translations. DO NOT MERGE

9 years agoam 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:24:45 +0000 (04:24 +0000)]
am 18d86828: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '18d8682802460074f4b0e628bae4d4051d542c77':
  Import translations. DO NOT MERGE

9 years agoam 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:24:30 +0000 (04:24 +0000)]
am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '40f6e9ab3ea41203d0ba1737713db58751e1995d':
  Import translations. DO NOT MERGE

9 years agoam 90c22976: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:20:45 +0000 (04:20 +0000)]
am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '90c2297645341f347f56b160f06551963c64d039':
  Import translations. DO NOT MERGE

9 years agoam 7930f872: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 04:20:33 +0000 (04:20 +0000)]
am 7930f872: (-s ours) Import translations. DO NOT MERGE

* commit '7930f872ad6b3f0e27c41d848131204eac0cd705':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 01:24:49 +0000 (18:24 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22390723
Change-Id: I2098bcc385398b9e2ac2be40f18e98819d52dc7c

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 01:15:07 +0000 (18:15 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22390723
Change-Id: Ifa5940a4053147c433ff717d920c6f724b53affa

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Thu, 6 Aug 2015 01:05:28 +0000 (18:05 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 22390723
Change-Id: I313c60b172c8d6694f577f87ce01e889d4b6da16

9 years agoam cef52a74: am 854533a8: am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide syste...
Jason Monk [Wed, 5 Aug 2015 20:59:42 +0000 (20:59 +0000)]
am cef52a74: am 854533a8: am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit 'cef52a745a9ebb62f27fc6ecb8c24947b7916e4f':
  Hide show/hide system from battery optimizations list

9 years agoam 854533a8: am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from batter...
Jason Monk [Wed, 5 Aug 2015 20:52:19 +0000 (20:52 +0000)]
am 854533a8: am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit '854533a82d5cfeac27e80b610544291c5be4fa39':
  Hide show/hide system from battery optimizations list

9 years agoam 38e0c9fb: am 95a524a4: am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am...
Sanket Padawe [Wed, 5 Aug 2015 20:44:51 +0000 (20:44 +0000)]
am 38e0c9fb: am 95a524a4: am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '38e0c9fb5bdf120f6e8e2428bfbff2da048b4911':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoam 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizatio...
Jason Monk [Wed, 5 Aug 2015 20:44:41 +0000 (20:44 +0000)]
am 5b12cb77: am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit '5b12cb7712d85025c93ad941b0694916c0566a37':
  Hide show/hide system from battery optimizations list

9 years agoam 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list
Jason Monk [Wed, 5 Aug 2015 20:37:17 +0000 (20:37 +0000)]
am 150e60ca: am 888673bd: Hide show/hide system from battery optimizations list

* commit '150e60ca9ad594d36aa12b425836a7d61b68501c':
  Hide show/hide system from battery optimizations list

9 years agoam 21eff785: am e396c224: am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement...
Ajay Panicker [Wed, 5 Aug 2015 20:36:11 +0000 (20:36 +0000)]
am 21eff785: am e396c224: am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit '21eff785a77c907724a9d44c06ff5c4c66204f3b':
  Implement Bluetooth settings factory reset (5/5)

9 years agoam 95a524a4: am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am...
Sanket Padawe [Wed, 5 Aug 2015 20:33:11 +0000 (20:33 +0000)]
am 95a524a4: am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '95a524a4ffd2da1873b9ac023f985afac4691b82':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoam 888673bd: Hide show/hide system from battery optimizations list
Jason Monk [Wed, 5 Aug 2015 20:30:40 +0000 (20:30 +0000)]
am 888673bd: Hide show/hide system from battery optimizations list

* commit '888673bd51acf9263163acfebdd0680358deabaa':
  Hide show/hide system from battery optimizations list

9 years agoam eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am...
Sanket Padawe [Wed, 5 Aug 2015 20:27:24 +0000 (20:27 +0000)]
am eb04b01b: am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'eb04b01b3ffc44f6dec1a7d24228fcd4ab6116ee':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoam ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am...
Sanket Padawe [Wed, 5 Aug 2015 20:20:47 +0000 (20:20 +0000)]
am ac02e250: am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit 'ac02e250c1540c85c29e0ae753cb365c155c2968':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoam 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am...
Sanket Padawe [Wed, 5 Aug 2015 20:12:00 +0000 (20:12 +0000)]
am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '151612fb0de35fd2fadb096511f108b433100149':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoHide show/hide system from battery optimizations list
Jason Monk [Wed, 5 Aug 2015 20:06:19 +0000 (16:06 -0400)]
Hide show/hide system from battery optimizations list

Bug: 22977820
Change-Id: I1741bfe3e8703bae8ce10503879adfd12e9eb4fc

9 years agoam 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am...
Sanket Padawe [Wed, 5 Aug 2015 20:07:15 +0000 (20:07 +0000)]
am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '5f9d15ed252e0870097533bd75a759f28f2bda0d':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoam e396c224: am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settin...
Ajay Panicker [Wed, 5 Aug 2015 18:43:17 +0000 (18:43 +0000)]
am e396c224: am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit 'e396c2241ff629bcfd60bd3caf3fe2da7637dee6':
  Implement Bluetooth settings factory reset (5/5)

9 years agoam 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am...
Sanket Padawe [Wed, 5 Aug 2015 18:28:12 +0000 (18:28 +0000)]
am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.

* commit '86d853000feca5a627ef87760cdd7df3c3aea1bb':
  Check for special char when renaming device for Wi-Fi direct.

9 years agoam f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory...
Ajay Panicker [Wed, 5 Aug 2015 18:26:05 +0000 (18:26 +0000)]
am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit 'f1ffec39b64d85b361f7814690fd5eec0a176f51':
  Implement Bluetooth settings factory reset (5/5)

9 years agoam 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5...
Ajay Panicker [Wed, 5 Aug 2015 18:16:29 +0000 (18:16 +0000)]
am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit '1dd985abdc5e2a04cf97b4dce778db89891e5064':
  Implement Bluetooth settings factory reset (5/5)

9 years agoam cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
Ajay Panicker [Wed, 5 Aug 2015 18:01:14 +0000 (18:01 +0000)]
am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit 'cd8acb2256ca37ac4d1b71c513bac4e541c67c6d':
  Implement Bluetooth settings factory reset (5/5)

9 years agoMerge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
Ajay Panicker [Wed, 5 Aug 2015 17:49:08 +0000 (17:49 +0000)]
Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

9 years agoam ca26f032: am 4734d829: am 6be055a8: am c86f6dfd: am 244fd782: Merge "Remove summar...
Jason Monk [Wed, 5 Aug 2015 17:32:41 +0000 (17:32 +0000)]
am ca26f032: am 4734d829: am 6be055a8: am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev

* commit 'ca26f0327c97cb799b4b1348b20424f6a5227d08':
  Remove summaries fro configure apps page

9 years agoam 4734d829: am 6be055a8: am c86f6dfd: am 244fd782: Merge "Remove summaries fro confi...
Jason Monk [Wed, 5 Aug 2015 17:26:03 +0000 (17:26 +0000)]
am 4734d829: am 6be055a8: am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev

* commit '4734d829cd72acc70f24af88a3780c29d410af2d':
  Remove summaries fro configure apps page

9 years agoam 6be055a8: am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps...
Jason Monk [Wed, 5 Aug 2015 17:09:10 +0000 (17:09 +0000)]
am 6be055a8: am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev

* commit '6be055a83dc6a70bbce04774b1725c8696abb1fa':
  Remove summaries fro configure apps page

9 years agoam c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
Jason Monk [Wed, 5 Aug 2015 17:01:02 +0000 (17:01 +0000)]
am c86f6dfd: am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev

* commit 'c86f6dfdc83d1c6c1115dccc9db9d8073587036d':
  Remove summaries fro configure apps page

9 years agoam 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
Jason Monk [Wed, 5 Aug 2015 16:48:13 +0000 (16:48 +0000)]
am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev

* commit '244fd78205827d6c77367c2a46dca661d85a6d98':
  Remove summaries fro configure apps page

9 years agoam ea3f0326: (-s ours) am ea1724e2: (-s ours) am 38911d7a: (-s ours) am 093f3746...
Geoff Mendal [Wed, 5 Aug 2015 14:50:18 +0000 (14:50 +0000)]
am ea3f0326: (-s ours) am ea1724e2: (-s ours) am 38911d7a: (-s ours) am 093f3746: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam ea1724e2: (-s ours) am 38911d7a: (-s ours) am 093f3746: (-s ours) Import translati...
Geoff Mendal [Wed, 5 Aug 2015 14:44:44 +0000 (14:44 +0000)]
am ea1724e2: (-s ours) am 38911d7a: (-s ours) am 093f3746: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 38911d7a: (-s ours) am 093f3746: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:38:27 +0000 (14:38 +0000)]
am 38911d7a: (-s ours) am 093f3746: (-s ours) Import translations. DO NOT MERGE

* commit '38911d7a719483ab5f3a7ea18608774183229091':
  Import translations. DO NOT MERGE

9 years agoMerge "Remove summaries fro configure apps page" into mnc-dev
Jason Monk [Wed, 5 Aug 2015 14:34:14 +0000 (14:34 +0000)]
Merge "Remove summaries fro configure apps page" into mnc-dev

9 years agoam 093f3746: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:30:37 +0000 (14:30 +0000)]
am 093f3746: (-s ours) Import translations. DO NOT MERGE

* commit '093f37469ae513c273b5d1ab44793f1041888676':
  Import translations. DO NOT MERGE

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 14:05:39 +0000 (07:05 -0700)]
Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 5 Aug 2015 13:14:46 +0000 (06:14 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam a69dc8ee: am 944233e2: am 5a079608: am 596a8a3c: am 311a2d95: Merge "[Fingerprint...
Maurice Lam [Wed, 5 Aug 2015 01:20:41 +0000 (01:20 +0000)]
am a69dc8ee: am 944233e2: am 5a079608: am 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev

* commit 'a69dc8eea11e9097d7589f684e57e596135c87d4':
  [Fingerprint] Update string for enrolling

9 years agoam 944233e2: am 5a079608: am 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update strin...
Maurice Lam [Wed, 5 Aug 2015 01:11:25 +0000 (01:11 +0000)]
am 944233e2: am 5a079608: am 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev

* commit '944233e2521e3f92af92fe6af8c02780340724a7':
  [Fingerprint] Update string for enrolling

9 years agoam 5a079608: am 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update string for enrolli...
Maurice Lam [Wed, 5 Aug 2015 01:05:42 +0000 (01:05 +0000)]
am 5a079608: am 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev

* commit '5a07960889ca3c393e682c9ca1bbc2dff276ef1d':
  [Fingerprint] Update string for enrolling

9 years agoam 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into...
Maurice Lam [Wed, 5 Aug 2015 00:56:58 +0000 (00:56 +0000)]
am 596a8a3c: am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev

* commit '596a8a3c0ac4e931c52e3f4b391d4d4dca1fdcf6':
  [Fingerprint] Update string for enrolling

9 years agoam c4ea9b29: am c781bf30: am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint...
Maurice Lam [Wed, 5 Aug 2015 00:51:45 +0000 (00:51 +0000)]
am c4ea9b29: am c781bf30: am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev

* commit 'c4ea9b29c85837fdbe63a3089338137fd448d79d':
  [Fingerprint] Shrink fingerprint progress ring

9 years agoam 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:46:11 +0000 (00:46 +0000)]
am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev

* commit '311a2d952522eb61a513670a32462d22504401b1':
  [Fingerprint] Update string for enrolling

9 years agoam c781bf30: am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink finge...
Maurice Lam [Wed, 5 Aug 2015 00:44:00 +0000 (00:44 +0000)]
am c781bf30: am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev

* commit 'c781bf30ad0a10217fa74dbb5a2f61ab165d8b3f':
  [Fingerprint] Shrink fingerprint progress ring

9 years agoMerge "[Fingerprint] Update string for enrolling" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:38:37 +0000 (00:38 +0000)]
Merge "[Fingerprint] Update string for enrolling" into mnc-dev

9 years agoam e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progre...
Maurice Lam [Wed, 5 Aug 2015 00:35:27 +0000 (00:35 +0000)]
am e8f7ed9e: am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev

* commit 'e8f7ed9ea0ece56f58d5ea187ec00f01da54a2bf':
  [Fingerprint] Shrink fingerprint progress ring

9 years agoam 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring"...
Maurice Lam [Wed, 5 Aug 2015 00:27:22 +0000 (00:27 +0000)]
am 2a74b862: am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev

* commit '2a74b8623816b961f3da7f45f080e61067f951e6':
  [Fingerprint] Shrink fingerprint progress ring

9 years agoam 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:20:06 +0000 (00:20 +0000)]
am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev

* commit '8c9136efceaec05663ac9f655e7e9c7cceb3ac2a':
  [Fingerprint] Shrink fingerprint progress ring

9 years agoMerge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
Maurice Lam [Wed, 5 Aug 2015 00:09:32 +0000 (00:09 +0000)]
Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev

9 years agoam 177cebf7: am 54a34ac6: am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for...
Maurice Lam [Tue, 4 Aug 2015 23:56:34 +0000 (23:56 +0000)]
am 177cebf7: am 54a34ac6: am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling

* commit '177cebf7e32632bb493fab0f157f7fe4827c0572':
  [Fingerprint] Update string for enrolling

9 years agoam 54a34ac6: am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 23:47:51 +0000 (23:47 +0000)]
am 54a34ac6: am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling

* commit '54a34ac6f92577b95fb42ba9c55a230c68f80076':
  [Fingerprint] Update string for enrolling

9 years agoam 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 23:43:00 +0000 (23:43 +0000)]
am 6eb6f924: am c48ea1f5: [Fingerprint] Update string for enrolling

* commit '6eb6f924ac02afa004ea15ccbeecdd16c152b222':
  [Fingerprint] Update string for enrolling

9 years agoam c48ea1f5: [Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 23:36:09 +0000 (23:36 +0000)]
am c48ea1f5: [Fingerprint] Update string for enrolling

* commit 'c48ea1f5864b8f4d58eebd28173cff655193c70a':
  [Fingerprint] Update string for enrolling

9 years ago[Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[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

9 years ago[Fingerprint] Update string for enrolling
Maurice Lam [Tue, 4 Aug 2015 22:19:56 +0000 (15:19 -0700)]
[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

9 years agoImplement Bluetooth settings factory reset (5/5)
Ajay Panicker [Wed, 29 Jul 2015 18:39:16 +0000 (11:39 -0700)]
Implement Bluetooth settings factory reset (5/5)

Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default

Bug: 16161518
Change-Id: Ie5404a4547fcf747a0bb51d515e0c97628416f4b

9 years ago[Fingerprint] Shrink fingerprint progress ring
Maurice Lam [Tue, 4 Aug 2015 22:05:23 +0000 (15:05 -0700)]
[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

9 years agoam 183fcd53: am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge...
Jason Monk [Tue, 4 Aug 2015 21:10:14 +0000 (21:10 +0000)]
am 183fcd53: am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev

* commit '183fcd537023ef0e26cb6cd98d7cda48fdf12f20':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER

9 years agoam ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to...
Jason Monk [Tue, 4 Aug 2015 21:03:38 +0000 (21:03 +0000)]
am ddb22778: am bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev

* commit 'ddb22778100345a5a7bb00153e8e2f5b580c0d24':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER

9 years agoam bd776a0b: am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
Jason Monk [Tue, 4 Aug 2015 20:55:37 +0000 (20:55 +0000)]
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

9 years agoam 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev
Jason Monk [Tue, 4 Aug 2015 20:43:01 +0000 (20:43 +0000)]
am 9824c5da: resolved conflicts for merge of 1adca55f to mnc-dr-dev

* commit '9824c5da1efa9750fb19d477d29875a08289ecf5':
  UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER

9 years agoresolved conflicts for merge of 1adca55f to mnc-dr-dev
Jason Monk [Tue, 4 Aug 2015 20:23:32 +0000 (16:23 -0400)]
resolved conflicts for merge of 1adca55f to mnc-dr-dev

Change-Id: Iac88fbc39bbfb7aaa730652794b4aa73618c1d9c

9 years agoMerge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER...
Nick Kralevich [Tue, 4 Aug 2015 19:45:58 +0000 (19:45 +0000)]
Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev

9 years agoRemove summaries fro configure apps page
Jason Monk [Tue, 4 Aug 2015 19:25:32 +0000 (15:25 -0400)]
Remove summaries fro configure apps page

Bug: 22741399
Change-Id: Iead63e39eafdc9217a4e569b3b7b4e71f401e85e

9 years agoam 9390333c: am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for...
Jason Monk [Tue, 4 Aug 2015 18:23:57 +0000 (18:23 +0000)]
am 9390333c: am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev

* commit '9390333c84c6218cf70d0750c3f351ff208005f6':
  Update USB dialog for USB-C power option

9 years agoam d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power optio...
Jason Monk [Tue, 4 Aug 2015 18:14:38 +0000 (18:14 +0000)]
am d2af0859: am 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev

* commit 'd2af08595073f92eb54d6c08f6d896309b5270d9':
  Update USB dialog for USB-C power option

9 years agoam 661d1b77: am 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc...
Jason Monk [Tue, 4 Aug 2015 18:06:19 +0000 (18:06 +0000)]
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

9 years agoam 2e3775b9: Merge "Update USB dialog for USB-C power option" into mnc-dr-dev
Jason Monk [Tue, 4 Aug 2015 17:57:14 +0000 (17:57 +0000)]
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

9 years agoMerge "Update USB dialog for USB-C power option" into mnc-dr-dev
Jason Monk [Tue, 4 Aug 2015 17:44:00 +0000 (17:44 +0000)]
Merge "Update USB dialog for USB-C power option" into mnc-dr-dev

9 years agoam a4152146: am 92f7b48e: am 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibil...
Jason Monk [Tue, 4 Aug 2015 14:26:43 +0000 (14:26 +0000)]
am a4152146: am 92f7b48e: am 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable

* commit 'a41521465e88a2c29d6e41b735ed4593c3531c8c':
  Make sure accessibility service desc isn't clickable

9 years agoam 92f7b48e: am 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibility service...
Jason Monk [Tue, 4 Aug 2015 14:20:41 +0000 (14:20 +0000)]
am 92f7b48e: am 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable

* commit '92f7b48eb78dd4723cf3d65c163da9498e7ad936':
  Make sure accessibility service desc isn't clickable

9 years agoam 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\...
Jason Monk [Tue, 4 Aug 2015 14:13:38 +0000 (14:13 +0000)]
am 7bed7f04: am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable

* commit '7bed7f044311d08b3e602583311317c7e2f09a65':
  Make sure accessibility service desc isn't clickable

9 years agoam 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable
Jason Monk [Tue, 4 Aug 2015 14:04:19 +0000 (14:04 +0000)]
am 3daefe4c: am f61ead7a: Make sure accessibility service desc isn\'t clickable

* commit '3daefe4c94fc2f411f100ba2488322fe9885d362':
  Make sure accessibility service desc isn't clickable

9 years agoam f61ead7a: Make sure accessibility service desc isn\'t clickable
Jason Monk [Tue, 4 Aug 2015 13:57:27 +0000 (13:57 +0000)]
am f61ead7a: Make sure accessibility service desc isn\'t clickable

* commit 'f61ead7ad619a9933b6d87f0ddf4506d05253ee1':
  Make sure accessibility service desc isn't clickable

9 years agoMake sure accessibility service desc isn't clickable
Jason Monk [Tue, 4 Aug 2015 13:44:10 +0000 (09:44 -0400)]
Make sure accessibility service desc isn't clickable

Bug: 21644974
Change-Id: Ic645a78382c5c8343b22254ce4844068735efce9

9 years agoUpdate USB dialog for USB-C power option
Jason Monk [Wed, 29 Jul 2015 18:53:35 +0000 (14:53 -0400)]
Update USB dialog for USB-C power option

Also includes a bit of visual updates, options now have summaries
as well.

Code has been refactored a bit, and is more flexible to easily
support any kind of power/data flow combination once its time
to support that.

Currently devices don't have USB-C ports, they can be simulated
with the following commands:
  $ adb shell dumpsys usb add-port "matrix" dual
  # ?s control whether these can be changed
  $ adb shell dumpsys usb connect-port "matrix" ufp? sink? device?
  # Do testing here
  $ adb shell dumpsys usb disconnect-port "matrix"
  $ adb shell dumpsys usb remove-port "matrix"
  $ adb shell dumpsys usb reset
  # Use the help for more info
  $ adb shell dumpsys usb -h

Bug: 21615151
Change-Id: I53ad4de51ff10a197c87bf2741756c1821ee9e74

9 years agoam bd3119cc: am 437c0d25: am a180141e: am e86b170d: am f426126a: Merge "Fix issue...
Dianne Hackborn [Tue, 4 Aug 2015 04:55:10 +0000 (04:55 +0000)]
am bd3119cc: am 437c0d25: am a180141e: am e86b170d: am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

* commit 'bd3119ccb443a53362cb5325854aa2392b0c043e':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs

9 years agoam 1cc416b8: am deb879cc: am e09bfe34: am bd3d49f7: am 6e64e22e: Merge "Explain prope...
Chris Tate [Tue, 4 Aug 2015 04:55:09 +0000 (04:55 +0000)]
am 1cc416b8: am deb879cc: am e09bfe34: am bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev

* commit '1cc416b8a4bf64d13a07a69a263e6d41f84f3f80':
  Explain properly when apps can open multiple hosts' links

9 years agoam 437c0d25: am a180141e: am e86b170d: am f426126a: Merge "Fix issue #22860466: viapi...
Dianne Hackborn [Tue, 4 Aug 2015 01:37:50 +0000 (01:37 +0000)]
am 437c0d25: am a180141e: am e86b170d: am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

* commit '437c0d2547b089f413a04a0e414ff7cf6c251def':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs

9 years agoam deb879cc: am e09bfe34: am bd3d49f7: am 6e64e22e: Merge "Explain properly when...
Chris Tate [Tue, 4 Aug 2015 01:37:49 +0000 (01:37 +0000)]
am deb879cc: am e09bfe34: am bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev

* commit 'deb879cc5bccb0bad7d49595db9b704520c621ac':
  Explain properly when apps can open multiple hosts' links

9 years agoam 881207b0: am a2ef9256: am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact...
Prem Kumar [Tue, 4 Aug 2015 01:33:19 +0000 (01:33 +0000)]
am 881207b0: am a2ef9256: am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev

* commit '881207b035a47fe5c698b4a99e28325ffa787f74':
  Allow Contact sharing by default while connecting Car Kit.

9 years agoam ce08d4d3: am 36d6d2ff: am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help...
Maurice Lam [Tue, 4 Aug 2015 01:33:18 +0000 (01:33 +0000)]
am ce08d4d3: am 36d6d2ff: am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock

* commit 'ce08d4d30811e251a2437f13ecb6bdfc00e179c4':
  [Fingerprint] Help text for backup screen lock

9 years agoam 109e329b: (-s ours) am 28a4f1fd: (-s ours) am 568c167b: (-s ours) am 8b046c1a...
Geoff Mendal [Tue, 4 Aug 2015 01:33:17 +0000 (01:33 +0000)]
am 109e329b: (-s ours) am 28a4f1fd: (-s ours) am 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE

* commit '109e329bbd43aadfa921fa8d34089099b5a7d233':
  Import translations. DO NOT MERGE

9 years agoam a180141e: am e86b170d: am f426126a: Merge "Fix issue #22860466: viapi security...
Dianne Hackborn [Tue, 4 Aug 2015 01:24:14 +0000 (01:24 +0000)]
am a180141e: am e86b170d: am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

* commit 'a180141e329371b947771b907cb7cbc60b628fe8':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs

9 years agoam e09bfe34: am bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open...
Chris Tate [Tue, 4 Aug 2015 01:24:13 +0000 (01:24 +0000)]
am e09bfe34: am bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev

* commit 'e09bfe34d985320bea7e9b924dd0910cf639fa33':
  Explain properly when apps can open multiple hosts' links

9 years agoam a2ef9256: am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing...
Prem Kumar [Tue, 4 Aug 2015 01:23:46 +0000 (01:23 +0000)]
am a2ef9256: am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev

* commit 'a2ef9256a102b9610118aede3b5142c8fe047f88':
  Allow Contact sharing by default while connecting Car Kit.

9 years agoam 36d6d2ff: am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backu...
Maurice Lam [Tue, 4 Aug 2015 01:23:45 +0000 (01:23 +0000)]
am 36d6d2ff: am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock

* commit '36d6d2ff08d5e9bd9ecaa176f6ebea99c7f7db6f':
  [Fingerprint] Help text for backup screen lock

9 years agoam 28a4f1fd: (-s ours) am 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042...
Geoff Mendal [Tue, 4 Aug 2015 01:23:44 +0000 (01:23 +0000)]
am 28a4f1fd: (-s ours) am 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE

* commit '28a4f1fdf7eefd0ad134d0a4caccdb0d61d07ddb':
  Import translations. DO NOT MERGE

9 years agoam e86b170d: am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber...
Dianne Hackborn [Tue, 4 Aug 2015 01:19:52 +0000 (01:19 +0000)]
am e86b170d: am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

* commit 'e86b170d7faf32d0677122c7273545a0144cc438':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs

9 years agoam 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while...
Prem Kumar [Tue, 4 Aug 2015 01:17:19 +0000 (01:17 +0000)]
am 21adfeeb: am b0d10e79: am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev

* commit '21adfeebc27869c0b17def319f08a514d325afa3':
  Allow Contact sharing by default while connecting Car Kit.

9 years agoam 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen...
Maurice Lam [Tue, 4 Aug 2015 01:17:18 +0000 (01:17 +0000)]
am 4c55266b: am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock

* commit '4c55266b168bba7bf2b4c5e33972beb0434135e6':
  [Fingerprint] Help text for backup screen lock

9 years agoam 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translati...
Geoff Mendal [Tue, 4 Aug 2015 01:17:17 +0000 (01:17 +0000)]
am 568c167b: (-s ours) am 8b046c1a: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE

* commit '568c167b3c99f628165c823f1c5b0cacf8a462a2':
  Import translations. DO NOT MERGE

9 years agoam bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts...
Chris Tate [Tue, 4 Aug 2015 01:15:39 +0000 (01:15 +0000)]
am bd3d49f7: am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev

* commit 'bd3d49f78712b12db99ef316e8ec42eb94ea0f06':
  Explain properly when apps can open multiple hosts' links

9 years agoam f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in...
Dianne Hackborn [Tue, 4 Aug 2015 01:12:29 +0000 (01:12 +0000)]
am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

* commit 'f426126a76745451893b8b9e131dea61e6fb9e63':
  Fix issue #22860466: viapi security bug - rubber stamping in nested VIs