Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
342,916 Commits 3 Branches 0 Tags
220871a697290529278ed16db508eda8e12f3fc7
Commit Graph

84 Commits

Author SHA1 Message Date
Xin Li
220871a697 Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from 
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
 2017-11-14 12:31:11 -08:00
Bill Yi
cdf13713d2 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I3e2f98b1332d9af6f2920163f0ac1e23a660ae5a
 2017-10-19 20:52:24 -07:00
Michael Wright
cc1bb5306c Merge "Add Persian keyboard layout to default layouts" into oc-mr1-dev 
am: 6033ab604f

Change-Id: Iaeceffc39a96bd499f807bb32747b7865c95be3a
 2017-08-17 02:05:25 +00:00
Michael Wright
cb4b5598be Add Persian keyboard layout to default layouts 
Change-Id: Id834e944ab17411b3e8de1b807713a425432c187
Fixes: 64753680
Test: manual
 2017-08-16 17:53:42 +01:00
Bill Yi
9d3e408b92 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ibcd651f5774663cee19cecc6da52264a0cd5d6a7
 2017-08-15 14:47:57 -07:00
Bill Yi
16140599f2 Import translations. DO NOT MERGE 
Change-Id: I962af978bb234c98434ec32b7cca97bdedb2e7f4
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-08-06 01:30:50 -07:00
Bill Yi
eb5023c042 Import translations. DO NOT MERGE 
Change-Id: I76bb8e2fed568a66c30becf53b570a0862b04896
Auto-generated-cl: translation import
 2017-06-22 21:17:01 -07:00
Bill Yi
69630c83ce Import translations. DO NOT MERGE 
Change-Id: Ic951e78cfac26124380b9c9b1d1bf6a2fd88a289
Auto-generated-cl: translation import
 2017-06-21 10:27:12 -07:00
Roozbeh Pournader
b84a505b62 Rename language+country resources to just language 
Bug: 26496609
Test: none
Change-Id: I40b99a8728f1f324f4c1f8066a61c3d5f92b1ac6
 2017-01-10 23:51:26 -08:00
Bill Yi
73c76b0920 Revert "Import translations. DO NOT MERGE" 
This reverts commit 909eeb6572.

Change-Id: Ib2dd031dc5d195edb1fc6675ee4c6f3597db61f9
 2016-12-05 18:56:56 +00:00
Bill Yi
909eeb6572 Import translations. DO NOT MERGE 
Change-Id: I78f9033e232a205c6ba9b40ffa6c7a445bb8e044
Auto-generated-cl: translation import
 2016-12-02 20:45:23 -08:00
Bill Yi
bd27b1ad52 Import translations. DO NOT MERGE 
Change-Id: I21d05ea37d15e191cb372eae3dfc4fdda669e70c
Auto-generated-cl: translation import
 2016-06-06 13:55:54 -07:00
Bill Yi
ceaa6d1783 Import translations. DO NOT MERGE 
Change-Id: I58166ab4355bc9fe7588b42bc0ac03792eb765da
Auto-generated-cl: translation import
 2016-05-22 23:45:18 -07:00
Baligh Uddin
20a063ebcb Import translations. DO NOT MERGE 
Change-Id: Id2b343a7eadd8b8d79728b87967b80cc5fc39061
Auto-generated-cl: translation import
 2016-05-16 13:00:38 -07:00
Bill Yi
78902e68f0 Import translations. DO NOT MERGE 
Change-Id: If5013cdb5d19da9999bbee32e54a7f0cfc538fa4
Auto-generated-cl: translation import
 2016-04-27 03:55:59 -07:00
Bill Yi
ddac00bb4f Import translations. DO NOT MERGE 
Change-Id: I84333e772b954985e8bbf9ee311929fbf7298c1e
Auto-generated-cl: translation import
 2016-04-09 02:40:27 -07:00
Geoff Mendal
264bf545fb Import translations. DO NOT MERGE 
Change-Id: If3c3332f5e4a9c74c7ea62e98a95c356c001137b
Auto-generated-cl: translation import
 2016-03-18 20:12:09 -07:00
Jeff Sharkey
78bcc89df4 Merge "Refactoring FBE APIs based on council feedback." into nyc-dev am: a0a58a2 
am: 5a128c4

* commit '5a128c4f33aa38d3a35b5884519f6bd3a355512d':
  Refactoring FBE APIs based on council feedback.
 2016-03-17 22:09:46 +00:00
Jeff Sharkey
8a372a0a28 Refactoring FBE APIs based on council feedback. 
Mostly consists of removing the word "encryption" from most APIs,
since we can't actually make promises about the data being encrypted.

Bug: 27531029
Change-Id: Iace9d7c4e64716abf86ed11847c40f3947e1d625
 2016-03-17 14:49:08 -06:00
Geoff Mendal
b88acdc549 Import translations. DO NOT MERGE 
Change-Id: I57f78b470413b14645c52e9ceef84d61778db1fc
Auto-generated-cl: translation import
 2016-02-22 05:28:01 -08:00
Geoff Mendal
b647986e64 Import translations. DO NOT MERGE 
Change-Id: I9f3574d4e4458bca7342d61026862e7a22ff49d4
Auto-generated-cl: translation import
 2016-02-17 05:28:52 -08:00
Geoff Mendal
28d1b42898 Import translations. DO NOT MERGE 
Change-Id: I7e676b7fe870971a5966bbf4d86a6c338c70751f
Auto-generated-cl: translation import
 2016-02-15 05:29:19 -08:00
Geoff Mendal
3d96fac421 Import translations. DO NOT MERGE 
Change-Id: I8e196e353460b6f05dbe69500c6373224857736f
Auto-generated-cl: translation import
 2015-12-16 05:37:22 -08:00
Jeff Sharkey
f9fc6d6cc0 More file-based encryption work. 
Add granular StorageManager APIs for key creation/destruction and
unlocking/locking.  Start passing through an opaque token as part
of the unlock command, but leave it empty for now.  We now have a
separate "prepare" method that sanity checks that user directories
are correctly setup.

Define a handful of system properties used for marking devices that
should be operating in FBE mode, and if they're emulating FBE.  Wire
a command to "sm", but persisting will come later.

Start using new "encryptionAware" flag on apps previously marked with
coreApp flag, which were apps running in the legacy CryptKeeper
model.  Small tweaks to handle non-encryptionAware voice interaction
services.  Switch PackageManager to consult StorageManager about the
unlocked state of a user.

Bug: 22358539
Change-Id: Ic2865f9b81c10ea39369c441422f7427a3c3c3d6
 2015-11-11 10:47:23 -08:00
Geoff Mendal
78210c34ab Import translations. DO NOT MERGE 
Change-Id: I9971ad4dba7f72bb883288a49020eb115e2fb34f
Auto-generated-cl: translation import
 2015-10-28 05:38:36 -07:00
Geoff Mendal
a1cf03194b Import translations. DO NOT MERGE 
Change-Id: I9fe6c2348c55959ac4adb4e93eda481b6886a697
Auto-generated-cl: translation import
 2015-10-26 05:42:22 -07:00
Kenny Root
4f08c1781b Merge "Add Workman keyboard layout" am: 9a65c36022 am: b0cc47efe5 
am: 6938fbf3a5

* commit '6938fbf3a5cf8a61d42d8d1778180c3a25114709':
  Add Workman keyboard layout
 2015-10-24 00:04:21 +00:00
Kenny Root
b0cc47efe5 Merge "Add Workman keyboard layout" 
am: 9a65c36022

* commit '9a65c36022482d7fd4217e537fa434cc79b69f39':
  Add Workman keyboard layout
 2015-10-23 23:39:24 +00:00
Kenny Root
9a65c36022 Merge "Add Workman keyboard layout" 2015-10-23 23:32:01 +00:00
Kenny Root
917ffb17c5 Add Workman keyboard layout 
Change-Id: I57574a11969f65c48900fabff218d3af4717dc9c
 2015-10-05 17:20:42 -07:00
Baligh Uddin
637eb2d9ed Import translations. DO NOT MERGE 
Change-Id: I2cdd44b0019090f2f4dbe355901e8ad8ffef626e
Auto-generated-cl: translation import
 2015-09-29 01:37:52 -07:00
Geoff Mendal
349ef86704 Import translations. DO NOT MERGE 
Change-Id: I7cab335626c677ed5dca5571a042a811a8f6811c
Auto-generated-cl: translation import
 2015-08-31 05:32:09 -07:00
Geoff Mendal
f9230b4e13 Import translations. DO NOT MERGE 
Change-Id: Ifb0916bcd17b16bf412f3370595fab52ab30c035
Auto-generated-cl: translation import
 2015-07-22 05:28:16 -07:00
Geoff Mendal
63361e086b Import translations. DO NOT MERGE 
Change-Id: I0e5de01df4bfa82f08a18b7279ae0be966932f68
Auto-generated-cl: translation import
 2015-07-08 05:22:50 -07:00
Geoff Mendal
6b370152a3 Import translations. DO NOT MERGE 
Change-Id: I36487f341adc97a7bda5d9e5722a074443845041
Auto-generated-cl: translation import
 2015-05-29 20:59:13 -07:00
Ying Wang
9f8ec39d11 am e8d735c7: Merge "Remove all_modules\'s dependency on keymaps validation." 
* commit 'e8d735c70a594abdfbf9ff16ef2ccfc9b87a3635':
  Remove all_modules's dependency on keymaps validation.
 2015-05-06 22:56:04 +00:00
Ying Wang
366d6d0d12 Remove all_modules's dependency on keymaps validation. 
With this we won't try to run validatekeymaps.exe when you run
"USE_MINGW=1 mma".
Also it seems it's too much to run the validation for every mma/mmma.
Validation in just platform build (droidcore) should be enough.

Change-Id: I22431009d4c2dd765bbd14b24eb5c8729b53d6c1
 2015-05-05 16:12:41 -07:00
Geoff Mendal
b83bf8330f Import translations. DO NOT MERGE 
Change-Id: Ifd3267e13368e7c6deccb173e90b65c5c7a526f6
Auto-generated-cl: translation import
 2015-04-22 05:30:32 -07:00
Geoff Mendal
c549f8f4a9 Import translations. DO NOT MERGE 
Change-Id: I4f9a97623c88e65d32873d996f29725024d9f37e
Auto-generated-cl: translation import
 2015-03-20 23:28:43 -07:00
Geoff Mendal
40f6a22b6e Import translations. DO NOT MERGE 
Change-Id: I1a8de3ff34e0661702038b8f006f920c5ca3ba27
Auto-generated-cl: translation import
 2015-02-26 16:08:40 -08:00
Baligh Uddin
46b75cf7df Import translations. DO NOT MERGE 
Change-Id: I6951b81085c270c7539e19a6524b8950e86cbabc
Auto-generated-cl: translation import
 2014-12-22 20:15:52 -08:00
Baligh Uddin
00e0b7db5c Import translations. DO NOT MERGE 
Change-Id: I122da3267b62331c0502557ef3bf07d49e9de329
Auto-generated-cl: translation import
 2014-09-30 00:15:02 -07:00
Geoff Mendal
9d01ed12ee Import translations. DO NOT MERGE 
Change-Id: Ie7e21471051b1c74d2c932a474dd50305ec659c9
Auto-generated-cl: translation import
 2014-07-30 10:36:35 -07:00
Baligh Uddin
50af6d7ae6 Remove deprecated locales - DO NOT MERGE 
Change-Id: Iac5489639edae2373ed0ce92f7d0fe22629a249a
 2014-07-19 13:05:12 -07:00
Baligh Uddin
dfe2d15eef Remove deprecated locales 
Change-Id: I9789601a2fffc8eb8e6eeff4a8bd6c83fbf6fb10
 2014-07-17 15:43:04 -07:00
Baligh Uddin
edc3ec360f Import translations. DO NOT MERGE 
Change-Id: I77b0f9e9140e419fbd54d636ee1f2d560afa48e2
Auto-generated-cl: translation import
 2014-07-05 09:18:29 -07:00
Baligh Uddin
28b91300c4 Import translations. DO NOT MERGE 
Change-Id: I8ac7188f10753e0f89761851b6f68c71d58866ed
Auto-generated-cl: translation import
 2014-06-30 14:34:10 +00:00
Baligh Uddin
7c88b17c2f Import translations. DO NOT MERGE 
Change-Id: I9636b1f0a2d28b1c3a44ccaabd27430b4ec4de73
Auto-generated-cl: translation import
 2014-05-26 12:13:28 -07:00
Baligh Uddin
f56c3b879a Import translations. DO NOT MERGE 
Change-Id: Iefebad182cd2aef382d47eaa2719bf6a49e624f1
Auto-generated-cl: translation import
 2014-05-20 08:15:58 -07:00
Michael Wright
d069cd5164 am dc0c52f4: am 7099995b: am a84d24c3: Merge "Extend support for nordic languages with Sami" 
* commit 'dc0c52f4f592f6b9731939f0031e977a70515d4a':
  Extend support for nordic languages with Sami
 2014-05-19 18:28:40 +00:00