Commit Graph

7837 Commits

Author SHA1 Message Date
Jason Monk
936734f5c1 am 74129926: am ebefd240: am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit '7412992651fa92ffe68dc4f76f4c7fdc17021614':
  Update battery optimization strings
2015-07-27 19:01:39 +00:00
Jason Monk
7412992651 am ebefd240: am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit 'ebefd240b6dd90a5ccc3da8f74cdc42e8c808ba7':
  Update battery optimization strings
2015-07-27 18:47:32 +00:00
Jason Monk
ebefd240b6 am f0b615de: am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit 'f0b615de0184c740dcaaea75e3f83fde7246d868':
  Update battery optimization strings
2015-07-27 18:36:36 +00:00
Jason Monk
f0b615de01 am b322fdf5: am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit 'b322fdf5b80e9ace8a8a4623a2c7f996434ac4eb':
  Update battery optimization strings
2015-07-27 18:19:09 +00:00
Jason Monk
b322fdf5b8 am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit '08cb39837f02f37b854e7a4598d6f48d41d1ce94':
  Update battery optimization strings
2015-07-27 18:06:02 +00:00
Jason Monk
c9eba1f253 Update battery optimization strings
Bug: 22687961
Change-Id: I039a781a0c3db991cbe4ad7d3e6246cc5cb1cbfa
2015-07-27 12:29:25 -04:00
Geoff Mendal
aeae201ddc Import translations. DO NOT MERGE
Change-Id: I8535a63ec3b802c8e4440831fb79bc34a7192a0d
Auto-generated-cl: translation import
2015-07-27 06:53:25 -07:00
Geoff Mendal
8a063b172f Import translations. DO NOT MERGE
Change-Id: Iafff2d9aee527129e8b4317222008f9314a536e2
Auto-generated-cl: translation import
2015-07-27 06:06:18 -07:00
Adrian Roos
81ce2ea882 am 2f00f2c8: am 8fee8176: am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec
* commit '2f00f2c84a8e0f99c7ccb35157a63128ec98c19a':
  Update FRP warning to spec
2015-07-25 16:54:16 +00:00
Adrian Roos
2f00f2c84a am 8fee8176: am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec
* commit '8fee817698c3a238e3f373eb93f1607cd2cbea0e':
  Update FRP warning to spec
2015-07-25 16:37:13 +00:00
Adrian Roos
8fee817698 am b87428a6: am 5ada0050: am 38c9b9eb: Update FRP warning to spec
* commit 'b87428a61d99b920f4e4704709f6f2974346aba8':
  Update FRP warning to spec
2015-07-25 16:15:05 +00:00
Adrian Roos
b87428a61d am 5ada0050: am 38c9b9eb: Update FRP warning to spec
* commit '5ada0050b742f126ad6cf82c75ce374ce92722ad':
  Update FRP warning to spec
2015-07-25 15:54:26 +00:00
Geoff Mendal
d94ed34100 Import translations. DO NOT MERGE
Change-Id: Ib87467a14cbaa3f37add4e0ee2f214aaa4e05e69
Auto-generated-cl: translation import
2015-07-24 23:08:45 -07:00
Adrian Roos
5ada0050b7 am 38c9b9eb: Update FRP warning to spec
* commit '38c9b9eb5ee2734c4f6f78854951e79bd9e9d3cf':
  Update FRP warning to spec
2015-07-25 00:59:08 +00:00
Geoff Mendal
48526f7f57 Import translations. DO NOT MERGE
Change-Id: I6757f72bd62c87fb898eaea77c3b7eefd7bd82fb
Auto-generated-cl: translation import
2015-07-24 17:22:30 -07:00
Geoff Mendal
92ca0cbe8f Import translations. DO NOT MERGE
Change-Id: Iee689b96e6d57b9968c5efb133425ca888099d46
Auto-generated-cl: translation import
2015-07-24 17:09:25 -07:00
Geoff Mendal
e37e12321b Import translations. DO NOT MERGE
Change-Id: Ic8304c3f1eb5a71815f72d71854fdcabca7204b8
Auto-generated-cl: translation import
2015-07-24 16:56:10 -07:00
Selim Cinek
01de6ef30a Autocapitalizing the fingerprint names now
Bug: 22412062
Change-Id: I72bba3a52c07909f7aae8193b4b3c92df44bad86
2015-07-24 16:50:16 -07:00
Selim Cinek
21574cdb37 Added content description for the fingerprint icon
Bug: 22616421
Change-Id: I58b12ae656b81e02f66aafef3d86eef1ade1e804
2015-07-24 16:30:22 -07:00
Adrian Roos
38c9b9eb5e Update FRP warning to spec
Bug: 22672924
Change-Id: Ie275d5099553539707f86bf0e8cec5d5022ad227
2015-07-24 15:09:34 -07:00
Colin Cross
dab025bdff resolved conflicts for merge of 769ba03b to master
Change-Id: I2cc213e1acaea2b26217016970a6e98fe547bb5b
2015-07-23 21:43:07 -07:00
Jason Monk
769ba03b8f am 0557f4c3: am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '0557f4c353448c55bbf82a8be75e515cf7f6371c':
  Remove tuner from development settings
2015-07-24 03:45:55 +00:00
Jason Monk
0557f4c353 am b46b9934: am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit 'b46b9934037ce8801acd6582f26200ee952ddc68':
  Remove tuner from development settings
2015-07-24 03:26:23 +00:00
Jason Monk
b46b993403 am 6d8fdb82: am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '6d8fdb829452a28af0c6c6bd253eb488abb4f770':
  Remove tuner from development settings
2015-07-24 03:03:23 +00:00
Geoff Mendal
28718aebd1 Import translations. DO NOT MERGE
Change-Id: I52c34f9ee160ac6f8ce81d8922a6d363ca0f348f
Auto-generated-cl: translation import
2015-07-23 18:23:19 -07:00
Geoff Mendal
5376d54e8e Import translations. DO NOT MERGE
Change-Id: I04098c09a5a3a63bb7109b0a3d064eaeed0cf1e2
Auto-generated-cl: translation import
2015-07-23 18:10:24 -07:00
Geoff Mendal
e9f9ea3aff Import translations. DO NOT MERGE
Change-Id: Ib963e118d1a07d17e7fa824a39f72d6611366804
Auto-generated-cl: translation import
2015-07-23 17:57:24 -07:00
Selim Cinek
b48e9fdcab Adapted a string in the fingerprint enrollment flow
Bug: 22634070
Change-Id: Ieefae6a6d23c22ea6719ccf8d843638bc92b4376
2015-07-23 15:29:01 -07:00
Maurice Lam
95d1eb90d3 am cff4eb9b: am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit 'cff4eb9b73182d6b68e0f91c4d08fc53bb2b91ec':
  [ScreenLock] Style encryption interstitial in SUW
2015-07-23 20:26:15 +00:00
Maurice Lam
1f95e5125f am 3f7ff2b6: am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '3f7ff2b60f85cf9bb39e3bb3551bcdbfa916fafa':
  [ScreenLock] Update illustration during setup wizard
2015-07-23 20:26:12 +00:00
Maurice Lam
cff4eb9b73 am ea0f0fdf: am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit 'ea0f0fdfa2ad7f4fce34095e9b357b6b74052ba0':
  [ScreenLock] Style encryption interstitial in SUW
2015-07-23 20:09:28 +00:00
Maurice Lam
3f7ff2b60f am 391e65e4: am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit '391e65e46594553515036cff019c9faaa2f2faf5':
  [ScreenLock] Update illustration during setup wizard
2015-07-23 20:09:26 +00:00
Maurice Lam
ea0f0fdfa2 am 7a335113: am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '7a33511397e1f69bbb920dd64a6544f65557ea44':
  [ScreenLock] Style encryption interstitial in SUW
2015-07-23 19:46:31 +00:00
Maurice Lam
391e65e465 am a5fa39dd: am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit 'a5fa39dd13552886ebe9903fcbd6084a9521fd16':
  [ScreenLock] Update illustration during setup wizard
2015-07-23 19:46:28 +00:00
Maurice Lam
7a33511397 am 9b6bd390: am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '9b6bd390f97e2c9852d0a6e1ec8f7359a6492f3e':
  [ScreenLock] Style encryption interstitial in SUW
2015-07-23 19:18:51 +00:00
Maurice Lam
a5fa39dd13 am ad904de8: am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit 'ad904de84644ab72754fe7d0cc5a34d1928c03f1':
  [ScreenLock] Update illustration during setup wizard
2015-07-23 19:18:48 +00:00
Jason Monk
6d8fdb8294 am 838c8432: Merge "Remove tuner from development settings" into mnc-dev
* commit '838c843217c76418e5f65b38f40e6b39760de1e4':
  Remove tuner from development settings
2015-07-23 19:13:05 +00:00
Maurice Lam
9b6bd390f9 am 32b96646: Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev
* commit '32b96646eec917987fdd38208c6b11a9bc8832d3':
  [ScreenLock] Style encryption interstitial in SUW
2015-07-22 20:23:18 +00:00
Maurice Lam
ad904de846 am e44ceed1: Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev
* commit 'e44ceed122aa06482bf03d58eba91536a29e4158':
  [ScreenLock] Update illustration during setup wizard
2015-07-22 20:23:15 +00:00
Jason Monk
838c843217 Merge "Remove tuner from development settings" into mnc-dev 2015-07-22 19:29:59 +00:00
Maurice Lam
9e1429a54b Merge "[Fingerprint] Add strings for fingerprint during SUW" 2015-07-22 18:27:43 +00:00
Maurice Lam
760c4f1b5d [Fingerprint] Add strings for fingerprint during SUW
Bug: 22630959
Change-Id: I81aeb498f11bd27d56983776fd36fdbf38f25883
2015-07-22 11:21:31 -07:00
Geoff Mendal
0a167c400a Import translations. DO NOT MERGE
Change-Id: Iee7522d01901078d3a091eb4a6e9175e664e99e2
Auto-generated-cl: translation import
2015-07-22 06:59:04 -07:00
Geoff Mendal
9c17fab30f Import translations. DO NOT MERGE
Change-Id: I06e1210f46fc7a5e9e822b4bb4d11f7531c2c5eb
Auto-generated-cl: translation import
2015-07-22 06:11:39 -07:00
Maurice Lam
32b96646ee Merge "[ScreenLock] Style encryption interstitial in SUW" into mnc-dev 2015-07-21 23:40:02 +00:00
Maurice Lam
e44ceed122 Merge "[ScreenLock] Update illustration during setup wizard" into mnc-dev 2015-07-21 23:38:34 +00:00
Billy Lau
2e407c317a am 90bc96f8: am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit '90bc96f83dcfe84e697b8a8370488442665ce9e2':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:51:31 +00:00
Billy Lau
90bc96f83d am f7011298: am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit 'f7011298eda26b6972a36a9735182fa6afd35093':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:36:48 +00:00
Billy Lau
f7011298ed am bc3695c2: am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit 'bc3695c231a5a16f45059e0e561a35d49353afc5':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:21:45 +00:00
Billy Lau
bc3695c231 am e267fb31: am d06ba151: Merge "Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)..." into mnc-dev
* commit 'e267fb3119754f205bf8518a6c00d3e957b0e45f':
  Bug 21589105 Rescope WRITE_SETTINGS (UX and Settings app change)...
2015-07-21 18:06:42 +00:00