drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,431 Commits 1 Branch 0 Tags
Commit Graph

6226 Commits

Author SHA1 Message Date
Baligh Uddin
530dc6f610 Merge "Import translations. DO NOT MERGE" 2012-10-16 21:12:52 -07:00
Jim Miller
6fa7bcfc36 am 366a6f2b: am ac8b732e: am 48994ce9: Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev 
* commit '366a6f2bf3be44013f1bcd5ad3c3bd4ffe562616':
  Fix missing layout parameters in keyguard.
 2012-10-16 17:36:06 -07:00
Jim Miller
366a6f2bf3 am ac8b732e: am 48994ce9: Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev 
* commit 'ac8b732e37ab68046c46b48302663e00a8dcb334':
  Fix missing layout parameters in keyguard.
 2012-10-16 17:33:23 -07:00
Jim Miller
48994ce945 Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev 2012-10-16 17:28:08 -07:00
Jim Miller
bdffd5c3a1 Fix missing layout parameters in keyguard. 
This addresses crashes caused by an upcoming change to crash
when missing layout_width and layout_height attributes are missing.

Change-Id: I71044b4623d04cab41f4aee6a7a5c01b67b0d2a5
 2012-10-16 13:55:13 -07:00
Baligh Uddin
53b799c279 Import translations. DO NOT MERGE 
Change-Id: Ia084bf47cd6d4e5f88b03e469fccb539ae6c9dc0
Auto-generated-cl: translation import
 2012-10-16 13:32:41 -07:00
Baligh Uddin
62e546016e Merge "Import translations. DO NOT MERGE" 2012-10-16 09:10:38 -07:00
Baligh Uddin
75e861b689 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-16 09:08:22 -07:00
Romain Guy
9070bcbd17 am da7da3fb: am 4feddb27: am dec26f20: Merge "Add missing layout_width/height Bug #7334849" into jb-mr1-dev 
* commit 'da7da3fb850c5b1ccb348b8202ead2a2eedb62c6':
  Add missing layout_width/height Bug #7334849
 2012-10-15 20:22:56 -07:00
Romain Guy
da7da3fb85 am 4feddb27: am dec26f20: Merge "Add missing layout_width/height Bug #7334849" into jb-mr1-dev 
* commit '4feddb27ef51201c35a20d12d8bf0a7cbb50636e':
  Add missing layout_width/height Bug #7334849
 2012-10-15 20:19:21 -07:00
Romain Guy
42b0c70a31 Add missing layout_width/height 
Bug #7334849

Change-Id: Ie4bbe5905bec1d410b8b51e0194bb1c8c2b84680
 2012-10-15 16:47:16 -07:00
Jim Miller
41d7372a72 am c866b801: am 1deaf3c7: am 87d57952: Minor layout tweaks and bug fix in keyguard 
* commit 'c866b8013a6dd5e7c95f8a197170904f753033ea':
  Minor layout tweaks and bug fix in keyguard
 2012-10-15 02:35:31 -07:00
Jim Miller
c866b8013a am 1deaf3c7: am 87d57952: Minor layout tweaks and bug fix in keyguard 
* commit '1deaf3c710c54a23ace35e1f5c1718591133b681':
  Minor layout tweaks and bug fix in keyguard
 2012-10-15 02:32:48 -07:00
Jim Miller
87d57952af Minor layout tweaks and bug fix in keyguard 
- fix wrong string in SIM PUK unlock
- use buttonBar style for "emergency" and "forgot pattern" buttons

Bug 7341237

Change-Id: Id5593b54c345e3f869b6febc8554da01e7cb319e
 2012-10-15 02:10:57 -07:00
Jim Miller
f2ce7735cb am bd95bd21: am 63b977de: am 14bb25a3: Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev 
* commit 'bd95bd212a69be59f74b9cc5f3c76617a4a21833':
  Fixing issues with pattern recovery / account view (issue 7341237):
 2012-10-15 01:04:41 -07:00
Jim Miller
bd95bd212a am 63b977de: am 14bb25a3: Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev 
* commit '63b977de7e7cba17ba8abd78f7750d4bc56c8c45':
  Fixing issues with pattern recovery / account view (issue 7341237):
 2012-10-15 01:02:39 -07:00
Adam Cohen
6f131416ba Fixing issues with pattern recovery / account view (issue 7341237): 
-> Recovery button should only appear if account present
-> Recovery button should appear at bottom
-> Account view should have emergency call button
-> Account view should not show the clock / status area

Change-Id: Id12e8219f3fc6ecb14e82c5ec6ea4b3e28ed772d
 2012-10-14 21:25:08 -07:00
Adam Powell
dd17fb79a6 am 57ca4d85: am 13b82d66: am 85341a76: Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev 
* commit '57ca4d85be25f4715573f42fb8cd61123e551a88':
  Fix keyguard dimensions; IME state for password view; layouts
 2012-10-13 01:50:27 -07:00
Adam Powell
57ca4d85be am 13b82d66: am 85341a76: Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev 
* commit '13b82d668db5013ff9aa6a2e471a821d31799bfe':
  Fix keyguard dimensions; IME state for password view; layouts
 2012-10-13 01:47:53 -07:00
Adam Powell
70bc9f24ce Fix keyguard dimensions; IME state for password view; layouts 
Fix a bug where ordering during inflation caused us not to set a
keyguard callback early enough to properly modify window flags. Add a
gross hack to work around this for now.

Fix status layouts to scale a bit more gracefully in the presence of
an IME.

Fix password layouts to scale more gracefully in the presence of an
IME

Bug 7343312
Bug 7341795
Bug 7342963
Bug 7343089

Change-Id: Ifb2c06defef11e8f7f9d0e09855632ed491bb31c
 2012-10-13 01:25:51 -07:00
Adam Powell
fa87109c56 am 75cf582c: am eda02c7e: am 308b1a66: Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev 
* commit '75cf582c028ffe179521825a1908cd747f190a33':
  Fix offsets for glowpad on keyguard
 2012-10-12 20:03:44 -07:00
Adam Powell
75cf582c02 am eda02c7e: am 308b1a66: Merge "Fix offsets for glowpad on keyguard" into jb-mr1-dev 
* commit 'eda02c7e3204a5e6dfdac8fb84c61a112fdc6823':
  Fix offsets for glowpad on keyguard
 2012-10-12 20:01:45 -07:00
Adam Powell
f8b93b5503 Fix offsets for glowpad on keyguard 
Bug 7342491

Change-Id: Id9733070c28a85c47ac8b982768e47a4254bd825
 2012-10-12 19:33:49 -07:00
Adam Powell
282b530c63 am 1b22d8b8: am a1a51272: am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev 
* commit '1b22d8b8ff3b2d78eab69df12abfe8ea8bea662d':
  Align carrier info for glowpad keyguard screen
 2012-10-12 15:18:50 -07:00
Adam Powell
1b22d8b8ff am a1a51272: am 8dd3aadd: Merge "Align carrier info for glowpad keyguard screen" into jb-mr1-dev 
* commit 'a1a51272eddc842277e4ec10bdd3fed9b16ce866':
  Align carrier info for glowpad keyguard screen
 2012-10-12 15:16:19 -07:00
Adam Powell
ba48a39e17 Align carrier info for glowpad keyguard screen 
Bug 7317728

Change-Id: I0788c6555e2443026d0533e14b544a5daf810937
 2012-10-12 14:41:04 -07:00
Baligh Uddin
bd6e33b8cf Import translations. DO NOT MERGE 
Change-Id: Ice953a0847513628b0e16a83c571e337e4c6c109
Auto-generated-cl: translation import
 2012-10-12 12:08:38 -07:00
Baligh Uddin
654abdcf33 Import translations. DO NOT MERGE 
Change-Id: Ie7741746c85ad546258953e5e7cf8d2acd899c27
Auto-generated-cl: translation import
 2012-10-12 12:00:20 -07:00
Fabrice Di Meglio
35c492884c am d828e328: am a1d72e15: am 6ffbe600: Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev 
* commit 'd828e328bc6cfbcd30679b95f615e217ab56983d':
  Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware
 2012-10-12 11:46:05 -07:00
Fabrice Di Meglio
d828e328bc am a1d72e15: am 6ffbe600: Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev 
* commit 'a1d72e15f6fd5e6e330a70d550327ab8c8fcdbcf':
  Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware
 2012-10-12 11:43:43 -07:00
Fabrice Di Meglio
6ffbe60069 Merge "Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware" into jb-mr1-dev 2012-10-12 11:39:23 -07:00
Mike Cleron
223f3373d2 am d4c34387: am f4607172: am 732d88e1: Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev 
* commit 'd4c34387a6f319a5d824cb77f18966378ed065d7':
  Change keyguard to use single-stage unlock.
 2012-10-12 11:17:41 -07:00
Mike Cleron
d4c34387a6 am f4607172: am 732d88e1: Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev 
* commit 'f46071724b992807d7c58c97b85cb6d4c044db75':
  Change keyguard to use single-stage unlock.
 2012-10-12 11:13:57 -07:00
Christopher Tate
00d396aa62 am c025df62: am d6790721: am a3f33309: Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into jb-mr1-dev 
* commit 'c025df6276d4b3c830adbba7aed147c8e1c0ec55':
  DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity
 2012-10-12 11:09:51 -07:00
Mike Cleron
732d88e14e Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev 2012-10-12 11:07:52 -07:00
Christopher Tate
c025df6276 am d6790721: am a3f33309: Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into jb-mr1-dev 
* commit 'd6790721a9d8be03255dfc96e75abdf3a1bbe4d2':
  DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity
 2012-10-12 11:03:34 -07:00
Baligh Uddin
31fb344e03 Merge "Import translations. DO NOT MERGE" 2012-10-12 09:32:58 -07:00
Baligh Uddin
5650d86aa3 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-12 09:29:55 -07:00
Jim Miller
0ff7f010f8 Change keyguard to use single-stage unlock. 
Change-Id: Ica175a90ef4400941c7c4f05a494003b85d5e88c
 2012-10-12 03:53:57 -07:00
Fabrice Di Meglio
3cc10f420f Fix bug #7325609 FragmentBreadCrumbs should be RTL-aware 
- add horizontal gravity support
- use gravity for doing layout depending on layout direction

Change-Id: I562e824d15da9b00e1392f125b293aee21f8ee16
 2012-10-11 19:17:39 -07:00
Baligh Uddin
4f0d1eb95c Import translations. DO NOT MERGE 
Change-Id: I5b3b3b1e25c3fc6406339c4980814ef9218eddbd
Auto-generated-cl: translation import
 2012-10-11 18:38:09 -07:00
Baligh Uddin
40ad86e026 Import translations. DO NOT MERGE 
Change-Id: I4ef6935d25a8428069225adb3648701e93fd9c17
Auto-generated-cl: translation import
 2012-10-11 18:30:04 -07:00
Christopher Tate
39944808b5 DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity 
Based on 3rd party developer observation, this is a source of much
confusion and layout mistakes.

Change-Id: I2cb6ae1540fe2444582403d9100478ebe02df985
 2012-10-11 18:14:23 -07:00
Danielle Millett
8bb1f5abc4 am 855bdf65: am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 
* commit '855bdf6500edfc4496002367638c577318b0b912':
  Face Unlock is shown correctly during a phone call - fix b/7271718
 2012-10-11 17:52:28 -07:00
Adam Cohen
1c3bbfc7a4 am 68794263: am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev 
* commit '6879426372c707d1b67cff549fae523621884304':
  Final keyguard tablet layout integration
 2012-10-11 17:18:37 -07:00
Danielle Millett
855bdf6500 am 85a4ac92: am 8f89e6f8: Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 
* commit '85a4ac9281f5e592dead0f20146e4f154efd7c78':
  Face Unlock is shown correctly during a phone call - fix b/7271718
 2012-10-11 17:11:50 -07:00
Adam Cohen
6879426372 am 2514cbc2: am e60cdf12: Merge "Final keyguard tablet layout integration" into jb-mr1-dev 
* commit '2514cbc218923cb5e2270ebd9be19d2c9aad356e':
  Final keyguard tablet layout integration
 2012-10-11 17:11:13 -07:00
Danielle Millett
8f89e6f8e6 Merge "Face Unlock is shown correctly during a phone call - fix b/7271718" into jb-mr1-dev 2012-10-11 12:07:38 -07:00
Adam Cohen
e60cdf1291 Merge "Final keyguard tablet layout integration" into jb-mr1-dev 2012-10-11 11:08:19 -07:00
Baligh Uddin
615a6948b2 Merge "Import translations. DO NOT MERGE" 2012-10-10 21:19:55 -07:00