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

21533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sasha Levitskiy
4a2e8fed1a am 2e97520e: am 49abf5f4: am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev 
* commit '2e97520ec03542071827eaea084055e9e16442fc':
  Fingerprint: Add post enroll call
 2015-07-09 00:28:42 +00:00
Tim Kilbourn
5cf37f71eb am 8170e7a4: am 5ffa7c26: am 49983b99: Show correct text for app link domains. 
* commit '8170e7a49bea3a1d9e92caefcd28ba4e32d8c072':
  Show correct text for app link domains.
 2015-07-09 00:28:40 +00:00
Selim Cinek
8c3c8814f5 am 31e554ac: am babeeacb: am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 
* commit '31e554acff0106cade16516a056bdc1b0087ee6c':
  Fixed the layout for the fingerprint renaming
 2015-07-08 23:53:05 +00:00
Sasha Levitskiy
2e97520ec0 am 49abf5f4: am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev 
* commit '49abf5f4cb9d363246659f9320a3bfb99288adfa':
  Fingerprint: Add post enroll call
 2015-07-08 23:46:02 +00:00
Tim Kilbourn
8170e7a49b am 5ffa7c26: am 49983b99: Show correct text for app link domains. 
* commit '5ffa7c260f34ead64572b05b501bde0d194fef81':
  Show correct text for app link domains.
 2015-07-08 23:46:00 +00:00
Selim Cinek
31e554acff am babeeacb: am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 
* commit 'babeeacb58d0e24b752598de0383e082e6c76784':
  Fixed the layout for the fingerprint renaming
 2015-07-08 23:37:50 +00:00
Sasha Levitskiy
49abf5f4cb am 93b1a5a9: Merge "Fingerprint: Add post enroll call" into mnc-dev 
* commit '93b1a5a974f723f5aa463162b1f5aa43338f8c2e':
  Fingerprint: Add post enroll call
 2015-07-08 23:37:33 +00:00
Tim Kilbourn
5ffa7c260f am 49983b99: Show correct text for app link domains. 
* commit '49983b991c01af0bc958eee1ddad144b7bde44ec':
  Show correct text for app link domains.
 2015-07-08 23:37:32 +00:00
Sasha Levitskiy
93b1a5a974 Merge "Fingerprint: Add post enroll call" into mnc-dev 2015-07-08 23:34:26 +00:00
Selim Cinek
babeeacb58 am aab3a4c8: Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 
* commit 'aab3a4c84715ecb4c95b60081badd225202723df':
  Fixed the layout for the fingerprint renaming
 2015-07-08 23:22:58 +00:00
Selim Cinek
aab3a4c847 Merge "Fixed the layout for the fingerprint renaming" into mnc-dr-dev 2015-07-08 23:09:52 +00:00
Sasha Levitskiy
0e0cff3261 Fingerprint: Add post enroll call 
Bug 22007124

Change-Id: I670e101a1b7dfa77a4e45022840dfc916fe5ee0d
Signed-off-by: Sasha Levitskiy <sanek@google.com>
 2015-07-08 16:03:11 -07:00
Jorim Jaggi
2a90904f34 am 2986b0dc: am 221f3771: am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit '2986b0dc977131e80798b3701ba2c832537522d6':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:52:08 +00:00
Jeff Sharkey
2f87423cb3 am 05d51e24: am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '05d51e24744cb99edf00ea52b840be4d9662b8c2':
  Move storage when formatting primary disk.
 2015-07-08 22:52:06 +00:00
Selim Cinek
abd67de1ad Fixed the layout for the fingerprint renaming 
Bug: 21957061
Change-Id: I3bf0ecb1f513b51e2632cb9ddbb29e51a39a915c
 2015-07-08 15:47:56 -07:00
Tim Kilbourn
49983b991c Show correct text for app link domains. 
The user's preferences were not queried on the app listing, making it
look like an app would open links even after the user disabled app
links for the app.

Bug: 21093152
Change-Id: I133ff229bb5e289ebec8df06924936fb3177f095
 2015-07-08 15:43:43 -07:00
Jorim Jaggi
2986b0dc97 am 221f3771: am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit '221f3771aa3830ca8b8b662994759431dae2ee5b':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:37:47 +00:00
Jeff Sharkey
05d51e2474 am 22f66408: am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '22f664084dc0885a495194a907ce4c2af36c9c54':
  Move storage when formatting primary disk.
 2015-07-08 22:37:44 +00:00
Jorim Jaggi
221f3771aa am 3b517b68: am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit '3b517b68057857a2b2552dd09e520907c809f15a':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:22:13 +00:00
Jeff Sharkey
22f664084d am 68fdb73d: am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '68fdb73d0cb2e354063ff5e37349d942923e379e':
  Move storage when formatting primary disk.
 2015-07-08 22:22:11 +00:00
Jorim Jaggi
3b517b6805 am b493b291: Merge "Hide screenshot preference when assist is disabled" into mnc-dev 
* commit 'b493b2910190b95bba6cad0f328a0339acebef9b':
  Hide screenshot preference when assist is disabled
 2015-07-08 22:08:34 +00:00
Jeff Sharkey
68fdb73d0c am 80eba76b: Merge "Move storage when formatting primary disk." into mnc-dev 
* commit '80eba76b109efa7e48eaf7aac145e05938d4405e':
  Move storage when formatting primary disk.
 2015-07-08 22:08:32 +00:00
Jorim Jaggi
b493b29101 Merge "Hide screenshot preference when assist is disabled" into mnc-dev 2015-07-08 21:59:01 +00:00
Jeff Sharkey
80eba76b10 Merge "Move storage when formatting primary disk." into mnc-dev 2015-07-08 21:55:44 +00:00
Amit Mahajan
f3053c15e3 am e08a3512: am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev 
* commit 'e08a3512bbfb9c3ab73790cf382b514ec4924397':
  Remove 'do not translate' comment for string 'None'.
 2015-07-08 21:21:57 +00:00
Sanket Padawe
d49fbb372a am 012876e4: am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit '012876e400d573c9f2deb3c076c611f651e6e2ec':
  Locale based string changes in BT.
 2015-07-08 21:21:56 +00:00
Sanket Padawe
0af7dec8b5 am bd19918f: am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev 
* commit 'bd19918f87903031b6c32057a347d3759d9f1aca':
  Disable CA certificate for EAP-SIM, AKA & AKA'
 2015-07-08 21:21:55 +00:00
Amit Mahajan
e08a3512bb am 07578125: am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev 
* commit '0757812525349f31d921bc877886ece7d3a44c4d':
  Remove 'do not translate' comment for string 'None'.
 2015-07-08 21:08:11 +00:00
Sanket Padawe
012876e400 am beb277de: am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit 'beb277de3c01ca1bfed1e22be682a3f79325a6bf':
  Locale based string changes in BT.
 2015-07-08 21:08:09 +00:00
Sanket Padawe
bd19918f87 am 3dfe8963: am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev 
* commit '3dfe8963e6d2a02818a22f6a063fb671e7560d10':
  Disable CA certificate for EAP-SIM, AKA & AKA'
 2015-07-08 21:08:08 +00:00
Amit Mahajan
0757812525 am 2856c4fc: am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev 
* commit '2856c4fcbd4d4453245f4ed0aa7bb1bc02b2bd14':
  Remove 'do not translate' comment for string 'None'.
 2015-07-08 20:53:35 +00:00
Sanket Padawe
beb277de3c am a63ee14f: am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit 'a63ee14f45f22f87d2d112ee9e5686e91e9fedc7':
  Locale based string changes in BT.
 2015-07-08 20:53:32 +00:00
Sanket Padawe
3dfe8963e6 am f7a64d20: am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev 
* commit 'f7a64d206869ef783820f08966ad3bbf8ebe4559':
  Disable CA certificate for EAP-SIM, AKA & AKA'
 2015-07-08 20:53:31 +00:00
Amit Mahajan
2856c4fcbd am 01ce80b5: Merge "Remove \'do not translate\' comment for string \'None\'." into mnc-dev 
* commit '01ce80b574e2404d911750c16a1ddd89c787f3ff':
  Remove 'do not translate' comment for string 'None'.
 2015-07-08 20:37:19 +00:00
Sanket Padawe
a63ee14f45 am c7777b94: Merge "Locale based string changes in BT." into mnc-dev 
* commit 'c7777b947097160cd89252f1f1e27704d82c25f6':
  Locale based string changes in BT.
 2015-07-08 20:37:18 +00:00
Sanket Padawe
f7a64d2068 am c9cdf9c8: Merge "Disable CA certificate for EAP-SIM, AKA & AKA\'" into mnc-dev 
* commit 'c9cdf9c814020c777ffec7cfceb5b38c74e091f5':
  Disable CA certificate for EAP-SIM, AKA & AKA'
 2015-07-08 20:37:16 +00:00
Jorim Jaggi
56db978c2a Hide screenshot preference when assist is disabled 
Bug: 22343636
Change-Id: Ic455232dda209f7fadec41aee85903623a4e6bda
 2015-07-08 13:32:12 -07:00
Amit Mahajan
01ce80b574 Merge "Remove 'do not translate' comment for string 'None'." into mnc-dev 2015-07-08 20:24:10 +00:00
Amit Mahajan
3cd87a2f70 Remove 'do not translate' comment for string 'None'. 
Bug: 22278463
Change-Id: I29c288cd36cd7b65132b42a4b78749afa81064d6
 2015-07-08 11:07:34 -07:00
Sanket Padawe
c7777b9470 Merge "Locale based string changes in BT." into mnc-dev 2015-07-08 17:15:57 +00:00
Sanket Padawe
c9cdf9c814 Merge "Disable CA certificate for EAP-SIM, AKA & AKA'" into mnc-dev 2015-07-08 17:14:55 +00:00
Robin Lee
243a53cd6e am a0c850f2: am d81d249a: am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev 
* commit 'a0c850f24930ce6ad240e2a12aaf8ad020a7c561':
  Restore Vpn advanced options on re-init or rotate
 2015-07-08 17:07:36 +00:00
Robin Lee
a0c850f249 am d81d249a: am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev 
* commit 'd81d249af4b5384c8caf8a2c3b3923684714193d':
  Restore Vpn advanced options on re-init or rotate
 2015-07-08 16:54:55 +00:00
Robin Lee
d81d249af4 am e46e4827: am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev 
* commit 'e46e48271aacbe3278acb0dc52b439da1c3ec8e9':
  Restore Vpn advanced options on re-init or rotate
 2015-07-08 16:40:44 +00:00
Geoff Mendal
4dac108977 am d1a87a4a: (-s ours) am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'd1a87a4a39d588ed320df69dde741968cb41da20':
  Import translations. DO NOT MERGE
 2015-07-08 16:33:55 +00:00
Robin Lee
e46e48271a am 64e1e15d: Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev 
* commit '64e1e15d10b41f6993abf4cb77d220a05f79191a':
  Restore Vpn advanced options on re-init or rotate
 2015-07-08 16:27:42 +00:00
Geoff Mendal
d1a87a4a39 am d0249808: (-s ours) am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'd0249808fd8c1dd98b2cbe028a0448fda2e129ec':
  Import translations. DO NOT MERGE
 2015-07-08 16:19:49 +00:00
Robin Lee
64e1e15d10 Merge "Restore Vpn advanced options on re-init or rotate" into mnc-dev 2015-07-08 16:17:23 +00:00
Geoff Mendal
d0249808fd am 661dbf01: (-s ours) am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '661dbf01b7ba8cfdb1ab9d1a5dd2054c640fa183':
  Import translations. DO NOT MERGE
 2015-07-08 16:06:29 +00:00
Geoff Mendal
661dbf01b7 am 4a332ee8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '4a332ee8ed15c991e29e46490d2a9d93117bca26':
  Import translations. DO NOT MERGE
 2015-07-08 15:50:58 +00:00